diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 8377c24..5821ecc 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 saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run" version="3.26.3-Buenos Aires" saveDateTime="2022-09-14T15:12:10">
+<qgis saveDateTime="2022-09-15T12:14:11" projectname="Gun Run" saveUserFull="Timothy Allen" version="3.26.3-Buenos Aires" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,222 +21,222 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Marshals">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="marshal_positions" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [460]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="marshal_positions [460]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="extra_security" legend_split_behavior="0" source="./extra_security.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="extra_security" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="marshals_by_position" legend_split_behavior="0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
+      <layer-tree-layer providerKey="delimitedtext" expanded="1" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" type="QString" name="cached_name"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="marshals_by_position" name="cached_name"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="complete_marshal_overview" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="marshal_overviews" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews">
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="fencing" name="cached_name"/>
+            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="-1,-1" name="cone_only_groups" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="cone_only_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="-1,-1" name="fence_and_cone_groups" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Markers">
+      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" providerKey="memory" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="-1,-1" name="route_markers" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={1a51e78f-3249-44c4-a215-e94419bcf1dc}">
+        <layer-tree-layer providerKey="memory" expanded="1" checked="Qt::Checked" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={d548dd66-2e8e-4421-b39d-f7aa3181f54d}">
           <customproperties>
             <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" value="1" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="all_routes" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="timelapse" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' ">
+    <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' ">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
+          <Option type="QString" value="timelapse" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="water_tables" legend_split_behavior="0" source="./water_tables.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="water_tables" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Ask Me">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="poi_labels" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="directions_to_start" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start">
-        <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 groupLayer="" expanded="0" checked="Qt::Unchecked" name="Residents Access">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="mayor" legend_split_behavior="0" source="./mayor.shp">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="viplabels" legend_split_behavior="0" source="./viplabels.shp">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="vipaccess" legend_split_behavior="0" source="./vipaccess.shp">
+    </layer-tree-group>
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="QString" value="poi_labels" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="directions_to_start" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="mayor" source="./mayor.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="mayor" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="viplabels" source="./viplabels.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="golfaccess" legend_split_behavior="0" source="./golfaccess.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="vipaccess" source="./vipaccess.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="vipaccess" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="golfaccess" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="residents_access_roads" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="residents_access" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="OSM data">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Checked" patch_size="0,0" name="osm_roads" legend_split_behavior="0" source="./osm_roads.shp">
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="osm_roads" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="osm_places" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="osm_places" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_places [7]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Unchecked" name="Start and Finish pages">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="data-comments" legend_split_behavior="0" source="./data-comments.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="data-comments" source="./data-comments.shp">
         <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" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="start_finish_area" legend_split_behavior="0" source="./start_finish_area.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="start_finish_area" source="./start_finish_area.shp">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -244,35 +244,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Elevation">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="capetownelevation-1m" legend_split_behavior="0" source="./capetownelevation-1m.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="capetownelevation-1m" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Map">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_exp="" expanded="0" checked="Qt::Checked" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml">
+      <layer-tree-layer providerKey="gdal" expanded="0" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="Outlines" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137">
+      <layer-tree-layer providerKey="wms" expanded="1" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="Outlines" 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">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="Outlines" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -306,32 +306,32 @@
       <item>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" unit="1" enabled="1" intersection-snapping="1" maxScale="0" tolerance="10" type="1" scaleDependencyMode="0" self-snapping="1" minScale="0">
+  <snapping-settings enabled="1" tolerance="10" intersection-snapping="1" unit="1" type="1" self-snapping="1" mode="3" scaleDependencyMode="0" maxScale="0" minScale="0">
     <individual-layer-settings>
-      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="water_tables20170921142016467" units="2" enabled="0" maxScale="0" tolerance="0" type="2" minScale="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" enabled="1" maxScale="0" tolerance="20" type="2" minScale="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="extra_security20170921130834191" units="2" enabled="0" maxScale="0" tolerance="0" type="2" minScale="0"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="0" id="water_tables20170921142016467" type="2" maxScale="0" units="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="0" id="extra_security20170921130834191" type="2" maxScale="0" units="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" maxScale="0" units="1" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -339,10 +339,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40536111431805821</xmin>
-      <ymin>-33.9064593668288623</ymin>
-      <xmax>18.40637769723523931</xmax>
-      <ymax>-33.90592672608071467</ymax>
+      <xmin>18.39625754142732106</xmin>
+      <ymin>-33.91503468490690665</ymin>
+      <xmax>18.42878819477711616</xmax>
+      <ymax>-33.89799018096618255</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -364,165 +364,165 @@
   <projectModels/>
   <legend updateDrawingOrder="true">
     <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="marshal_positions">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="marshal_positions">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="extra_security">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="extra_security">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" open="true" name="marshals_by_position">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1" name="marshals_by_position">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="complete_marshal_overview">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="complete_marshal_overview">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="marshal_overviews">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="marshal_overviews">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Fencing and Cones">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="fencing">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="fencing">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="cone_only_groups">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="cone_only_groups">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="fence_and_cone_groups">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="fence_and_cone_groups">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="Routes">
       <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="route_markers">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" isInOverview="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="route_markers">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="all_routes">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="all_routes">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="timelapse">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
+    <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="timelapse">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
     <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="water_tables">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="water_tables20170921142016467" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="water_tables">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="poi_labels">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="poi_labels">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="directions_to_start">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="directions_to_start">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="mayor">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="mayor">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="viplabels">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="viplabels">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="vipaccess">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="vipaccess">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="golfaccess">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="golfaccess">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access_roads">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="residents_access_roads">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="residents_access">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="false" name="osm_roads">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="1" name="osm_roads">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="osm_places">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="osm_places">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="data-comments">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="data-comments">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="start_finish_area">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="start_finish_area">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" open="true" name="capetownelevation-1m">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1" name="capetownelevation-1m">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="false" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="Outlines">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="Outlines">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" legendPlaceholderImage="" autoRefreshEnabled="0" type="annotation" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -573,7 +573,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="100000" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="raster" maxScale="100000" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -638,7 +638,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -649,9 +649,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"/>
@@ -663,58 +663,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal enabled="0" fetchMode="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" symbology="Line" enabled="0" zscale="1" zoffset="0">
+      <elevation symbology="Line" enabled="0" zscale="1" band="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -745,36 +745,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -789,9 +789,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -800,27 +800,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Value" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" greenBand="2" blueBand="3" opacity="0.5" redBand="1" type="multibandcolor" nodataColor="">
+        <rasterrenderer alphaBand="-1" blueBand="3" nodataColor="" redBand="1" type="multibandcolor" greenBand="2" opacity="0.5">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -831,14 +831,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeBlue="128" colorizeRed="255" grayscaleMode="0" colorizeOn="0" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeStrength="100" grayscaleMode="0" invertColors="0" saturation="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="raster" maxScale="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -903,7 +903,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -914,7 +914,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"/>
@@ -926,58 +926,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal enabled="0" fetchMode="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" symbology="Line" enabled="0" zscale="1" zoffset="0">
+      <elevation symbology="Line" enabled="0" zscale="1" band="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1008,36 +1008,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1052,9 +1052,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1063,27 +1063,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Undefined" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1094,14 +1094,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeBlue="128" colorizeRed="255" grayscaleMode="0" colorizeOn="0" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeStrength="100" grayscaleMode="0" invertColors="0" saturation="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1166,7 +1166,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1180,8 +1180,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_km" expression="$length * 100"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_m" expression="$length * 100 * 1000"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100" name="length_km"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100 * 1000" name="length_m"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1194,58 +1194,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="RouteLen" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="RouteLen" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1276,36 +1276,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1320,44 +1320,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1380,59 +1380,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" checkstate="0" label="Active Routes" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule symbol="1" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'"/>
-            <rule symbol="2" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'"/>
-            <rule symbol="3" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'"/>
-            <rule symbol="4" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule description="Only show when active in Atlas" checkstate="0" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" symbol="0">
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" label="21KM" symbol="1"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" label="10KM" symbol="2"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" label="5KM" symbol="3"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" label="Trail" symbol="4"/>
           </rule>
-          <rule symbol="5" label="Show by day" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )">
-            <rule symbol="6" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'"/>
-            <rule symbol="7" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'"/>
-            <rule symbol="8" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'"/>
-            <rule symbol="9" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" label="Show by day" symbol="5">
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" label="21KM" symbol="6"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" label="10KM" symbol="7"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" label="5KM" symbol="8"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" label="Trail" symbol="9"/>
           </rule>
-          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" symbol="10"/>
+          <rule checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Always show by day" symbol="11"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1452,44 +1452,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1505,32 +1505,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@0@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1545,15 +1545,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1561,35 +1561,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1620,36 +1620,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1669,40 +1669,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1725,38 +1725,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1776,40 +1776,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1832,47 +1832,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1892,44 +1892,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1945,32 +1945,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1985,15 +1985,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2001,35 +2001,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2060,36 +2060,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2109,40 +2109,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2165,38 +2165,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2216,40 +2216,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2272,58 +2272,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="10">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2354,56 +2354,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="11">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="11">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.46" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2434,45 +2434,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2492,44 +2492,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2545,32 +2545,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2585,15 +2585,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2601,35 +2601,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2660,36 +2660,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2709,40 +2709,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2765,38 +2765,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2816,40 +2816,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2872,47 +2872,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2932,44 +2932,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2985,32 +2985,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@3@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3025,15 +3025,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3041,35 +3041,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3100,36 +3100,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3149,40 +3149,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3205,38 +3205,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3256,40 +3256,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3312,47 +3312,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3372,44 +3372,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3425,32 +3425,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@4@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@4@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3465,15 +3465,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3481,35 +3481,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3540,36 +3540,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3589,40 +3589,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3645,38 +3645,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3696,40 +3696,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3752,47 +3752,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3812,44 +3812,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3865,32 +3865,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@5@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@5@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3905,15 +3905,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3921,35 +3921,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3980,36 +3980,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4029,40 +4029,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4085,38 +4085,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4136,40 +4136,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4192,47 +4192,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="6">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="6">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4252,44 +4252,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4305,32 +4305,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@6@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@6@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4345,15 +4345,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4361,35 +4361,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4420,36 +4420,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4469,40 +4469,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4525,38 +4525,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4576,40 +4576,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4632,47 +4632,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="7">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="7">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4692,44 +4692,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4745,32 +4745,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@7@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@7@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4785,15 +4785,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4801,35 +4801,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4860,36 +4860,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4909,40 +4909,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4965,38 +4965,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5016,40 +5016,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5072,47 +5072,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="8">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="8">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5132,44 +5132,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5185,32 +5185,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@8@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@8@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5225,15 +5225,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5241,35 +5241,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5300,36 +5300,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5349,40 +5349,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5405,38 +5405,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5456,40 +5456,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5512,47 +5512,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="9">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="9">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5572,44 +5572,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5625,32 +5625,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@9@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@9@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5665,15 +5665,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5681,35 +5681,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5740,36 +5740,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5789,40 +5789,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5845,38 +5845,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5896,40 +5896,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5952,15 +5952,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5969,47 +5969,47 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
           <rule description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="round($length / 1000, 0)" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round($length / 1000, 0)" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="164,113,88,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6032,34 +6032,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6074,98 +6074,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="km_marker()" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="1" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="1" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="km_marker()" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6174,19 +6174,19 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6195,47 +6195,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6266,9 +6266,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6276,16 +6276,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6296,8 +6296,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6306,8 +6306,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6316,8 +6316,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6326,8 +6326,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6336,8 +6336,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6346,8 +6346,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6356,8 +6356,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6366,8 +6366,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6390,8 +6390,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6400,91 +6400,91 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Sort" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Sort" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="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_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_km" expression="$length * 100"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_m" expression="$length * 100 * 1000"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100" name="length_km"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100 * 1000" name="length_m"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
         <columns>
-          <column type="field" width="152" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="163" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="field" width="188" name="length_m" hidden="0"/>
-          <column type="field" width="-1" name="Sort" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="266" name="length_km" hidden="0"/>
+          <column hidden="0" width="152" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="163" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="0" width="188" type="field" name="length_m"/>
+          <column hidden="0" width="-1" type="field" name="Sort"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="266" type="field" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6562,7 +6562,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6635,58 +6635,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6717,36 +6717,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6761,44 +6761,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6821,54 +6821,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="183,72,75,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6899,9 +6899,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6912,15 +6912,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6950,30 +6950,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <defaults>
-        <default field="ID" applyOnUpdate="0" expression=""/>
-        <default field="height" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="height" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="elevation" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="ID" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="height" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="elevation" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6996,7 +6996,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7071,58 +7071,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7153,36 +7153,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7197,44 +7197,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7257,38 +7257,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7303,9 +7303,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7316,17 +7316,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -7363,34 +7363,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="page" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="page" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7413,7 +7413,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7488,58 +7488,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7570,36 +7570,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -7614,44 +7614,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7674,38 +7674,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="38,162,105,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="f_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="38,162,105,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="f_diagonal" 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"/>
@@ -7720,9 +7720,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="f_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7734,9 +7734,9 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <Option type="Map">
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="int" name="embeddedWidgets/count"/>
+          <Option type="int" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7745,47 +7745,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="1" lineSizeType="MM" spacing="5" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="1" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="5" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="0" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7816,9 +7816,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7826,22 +7826,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -7885,45 +7885,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="306" name="name" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="306" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7980,7 +7980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -8045,7 +8045,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8070,58 +8070,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8152,36 +8152,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -8196,44 +8196,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8256,54 +8256,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,85,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8334,9 +8334,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8347,32 +8347,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="Name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="Name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -8387,67 +8387,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="LineGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="LineGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -8456,47 +8456,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8527,9 +8527,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8537,16 +8537,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8569,30 +8569,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8637,7 +8637,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8702,7 +8702,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8727,58 +8727,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8809,36 +8809,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8853,44 +8853,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8913,48 +8913,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
-          <rule symbol="1" label="10KM" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
-          <rule symbol="2" label="5KM" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
+          <rule description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" label="21KM" symbol="0"/>
+          <rule description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" label="10KM" symbol="1"/>
+          <rule description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8974,40 +8974,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="miter" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="area" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -9030,32 +9030,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9075,44 +9075,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -9128,32 +9128,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@0@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -9168,9 +9168,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9178,35 +9178,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9237,39 +9237,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9289,44 +9289,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -9342,32 +9342,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -9382,9 +9382,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9392,24 +9392,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9429,44 +9429,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -9482,32 +9482,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -9522,9 +9522,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9532,35 +9532,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9591,39 +9591,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9643,44 +9643,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9696,32 +9696,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9736,9 +9736,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9746,24 +9746,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9783,44 +9783,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9836,32 +9836,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9876,9 +9876,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9886,35 +9886,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="69,100,25,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9945,25 +9945,25 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9972,47 +9972,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10043,9 +10043,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10053,16 +10053,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10080,38 +10080,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="id" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10174,7 +10174,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -10247,58 +10247,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10329,36 +10329,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -10373,44 +10373,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10433,46 +10433,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="0.796078" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.796078" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="227,0,185,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10495,15 +10495,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10516,32 +10516,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10556,151 +10556,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="4" isExpression="0" multilineHeight="1" fontItalic="0" textColor="227,0,185,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="4" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="227,0,185,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10715,89 +10715,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10806,145 +10806,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10953,47 +10953,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11024,9 +11024,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11034,16 +11034,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="10" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="10" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11054,8 +11054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -11064,8 +11064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -11074,43 +11074,43 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11186,7 +11186,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11251,7 +11251,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11280,58 +11280,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11362,36 +11362,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -11406,44 +11406,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11466,38 +11466,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,85,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,85,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -11512,9 +11512,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11525,13 +11525,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -11540,47 +11540,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11611,9 +11611,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11621,22 +11621,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -11687,50 +11687,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
+        <alias index="5" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="415" name="name" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="fence_len" hidden="0"/>
+          <column hidden="0" width="415" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11790,7 +11790,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11855,7 +11855,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11869,47 +11869,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" readOnly="0" simplifyLocal="1" simplifyDrawingHints="1" maxScale="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" minScale="1e+08" simplifyAlgorithm="0" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0">
+          <qgis readOnly="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" simplifyDrawingHints="1" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyLocal="1" maxScale="0" simplifyDrawingTol="1" labelsEnabled="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" force_rhr="0" type="line" name="0">
-                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="255,255,0,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.5"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="ring_filter" v="0"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
+                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="255,255,0,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.5" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="ring_filter"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11920,62 +11920,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontWeight="50" namedStyle="Regular" fontStrikeout="0" fontUnderline="0" textOpacity="0.8" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontCapitals="0" fontSize="11" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" fieldName="comment" blendMode="0" fontLetterSpacing="0" useSubstitutions="0" fontWordSpacing="0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeType="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSVGFile=""/>
-                      <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="comment" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontWeight="50" blendMode="0" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.8">
+                      <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM"/>
+                      <background shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="0.6" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRotation="0"/>
+                      <shadow shadowRadius="1.5" shadowOpacity="0.7" shadowUnder="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowScale="100" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" placeDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" formatNumbers="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" priority="5" xOffset="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placement="4" centroidWhole="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" preserveRotation="1" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" distUnits="MM" dist="5" placementFlags="2" maxCurvedCharAngleOut="-25"/>
-                    <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" displayAll="1" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" zIndex="0" scaleMin="0" obstacleFactor="1"/>
+                    <text-format addDirectionSymbol="0" wrapChar="" formatNumbers="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" decimals="3" leftDirectionSymbol="&lt;"/>
+                    <placement maxCurvedCharAngleIn="25" yOffset="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" fitInPolygonOnly="0" repeatDistanceUnits="MM" offsetUnits="MM" preserveRotation="1" dist="5" centroidInside="0" quadOffset="4" repeatDistance="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" centroidWhole="0" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="4" geometryGenerator="" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" limitNumLabels="0" displayAll="1" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontWeight="63" namedStyle="Semibold" fontStrikeout="0" fontUnderline="0" textOpacity="1" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontCapitals="0" fontSize="12" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" blendMode="0" fontLetterSpacing="0" useSubstitutions="0" fontWordSpacing="0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeType="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSVGFile=""/>
-                      <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="round( $length, 1) || 'm'" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontWeight="63" blendMode="0" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
+                      <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM"/>
+                      <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRotation="0"/>
+                      <shadow shadowRadius="1.5" shadowOpacity="0.7" shadowUnder="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowScale="100" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" placeDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" formatNumbers="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" priority="5" xOffset="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placement="2" centroidWhole="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" preserveRotation="1" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" distUnits="MM" dist="1" placementFlags="15" maxCurvedCharAngleOut="-25"/>
-                    <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" displayAll="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" zIndex="0" scaleMin="0" obstacleFactor="1"/>
+                    <text-format addDirectionSymbol="0" wrapChar="" formatNumbers="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" decimals="3" leftDirectionSymbol="&lt;"/>
+                    <placement maxCurvedCharAngleIn="25" yOffset="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" fitInPolygonOnly="0" repeatDistanceUnits="MM" offsetUnits="MM" preserveRotation="1" dist="1" centroidInside="0" quadOffset="4" repeatDistance="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" centroidWhole="0" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" geometryGenerator="" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" limitNumLabels="0" displayAll="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11983,8 +11983,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11992,21 +11992,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" lineSizeType="MM" scaleDependency="Area" scaleBasedVisibility="0" height="15" width="15" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" barWidth="5" diagramOrientation="Up" maxScaleDenominator="1e+08" backgroundColor="#ffffff" backgroundAlpha="255" minimumSize="0" minScaleDenominator="0" enabled="0" sizeType="MM">
+              <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
                 <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+            <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -12090,81 +12090,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default field="id" applyOnUpdate="0" expression=""/>
-              <default field="group" applyOnUpdate="0" expression=""/>
-              <default field="comment" applyOnUpdate="0" expression=""/>
-              <default field="moveable" applyOnUpdate="0" expression=""/>
-              <default field="type" applyOnUpdate="0" expression=""/>
-              <default field="name" applyOnUpdate="0" expression=""/>
-              <default field="hidden" applyOnUpdate="0" expression=""/>
-              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
-              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
-              <default field="fence_len" applyOnUpdate="0" expression=""/>
-              <default field="cone_len" applyOnUpdate="0" expression=""/>
+              <default field="id" expression="" applyOnUpdate="0"/>
+              <default field="group" expression="" applyOnUpdate="0"/>
+              <default field="comment" expression="" applyOnUpdate="0"/>
+              <default field="moveable" expression="" applyOnUpdate="0"/>
+              <default field="type" expression="" applyOnUpdate="0"/>
+              <default field="name" expression="" applyOnUpdate="0"/>
+              <default field="hidden" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positiony" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positionx" expression="" applyOnUpdate="0"/>
+              <default field="fence_len" expression="" applyOnUpdate="0"/>
+              <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="id" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="group" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="comment" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="moveable" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="type" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="name" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="hidden" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="fence_len" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="cone_len" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="comment" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="moveable" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="hidden" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="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 desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
+            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
               <columns>
-                <column type="field" width="-1" hidden="0" name="id"/>
-                <column type="field" width="-1" hidden="0" name="group"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" width="223" hidden="0" name="comment"/>
-                <column type="field" width="-1" hidden="0" name="moveable"/>
-                <column type="field" width="-1" hidden="0" name="type"/>
-                <column type="field" width="414" hidden="0" name="name"/>
-                <column type="field" width="-1" hidden="0" name="hidden"/>
-                <column type="field" width="-1" hidden="0" name="fence_len"/>
-                <column type="field" width="-1" hidden="0" name="cone_len"/>
-                <column type="field" width="-1" hidden="1" name="auxiliary_storage_labeling_positiony"/>
-                <column type="field" width="-1" hidden="1" name="auxiliary_storage_labeling_positionx"/>
+                <column hidden="0" width="-1" type="field" name="id"/>
+                <column hidden="0" width="-1" type="field" name="group"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column hidden="0" width="223" type="field" name="comment"/>
+                <column hidden="0" width="-1" type="field" name="moveable"/>
+                <column hidden="0" width="-1" type="field" name="type"/>
+                <column hidden="0" width="414" type="field" name="name"/>
+                <column hidden="0" width="-1" type="field" name="hidden"/>
+                <column hidden="0" width="-1" type="field" name="fence_len"/>
+                <column hidden="0" width="-1" type="field" name="cone_len"/>
+                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positiony"/>
+                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -12237,58 +12237,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12319,36 +12319,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -12363,44 +12363,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12423,64 +12423,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0" referencescale="-1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Cones" symbol="0"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Moveable fences" symbol="1"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Fixed fences" symbol="2"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Construction" symbol="3"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Is Visible" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="1;4" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="Point" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dot" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -12511,56 +12511,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="4;3" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -12591,56 +12591,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12671,56 +12671,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12751,56 +12751,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12831,50 +12831,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12905,9 +12905,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12918,32 +12918,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="comment" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="comment" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.80000000000000004">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.59999999999999998" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.59999999999999998" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.6" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12958,118 +12958,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="5" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1.8200000000000001" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="5" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13092,34 +13092,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13134,112 +13134,112 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13262,34 +13262,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13304,112 +13304,112 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13432,34 +13432,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13474,72 +13474,72 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -13548,13 +13548,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;id&quot;" type="QString"/>
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13563,47 +13563,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13634,9 +13634,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13644,16 +13644,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13732,74 +13732,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="moveable" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="hidden" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="comment" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="moveable" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="hidden" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="comment" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="moveable" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="hidden" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="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="day" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="373" name="comment" hidden="0"/>
-          <column type="field" width="-1" name="moveable" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="316" name="name" hidden="0"/>
-          <column type="field" width="-1" name="hidden" hidden="0"/>
-          <column type="field" width="-1" name="fence_len" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="373" type="field" name="comment"/>
+          <column hidden="0" width="-1" type="field" name="moveable"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="316" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="hidden"/>
+          <column hidden="0" width="-1" type="field" name="fence_len"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13877,7 +13877,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13950,58 +13950,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14032,36 +14032,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -14076,44 +14076,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14136,54 +14136,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,178,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14214,9 +14214,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14227,11 +14227,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -14240,47 +14240,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14311,9 +14311,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14321,16 +14321,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14346,25 +14346,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14407,7 +14407,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -14480,58 +14480,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14562,36 +14562,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -14606,44 +14606,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14666,38 +14666,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="26,0,201,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="dot" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -14712,9 +14712,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14725,22 +14725,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -14749,47 +14749,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14820,9 +14820,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14830,22 +14830,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+                <Option type="bool" value="true" name="active"/>
+                <Option type="QString" value="id" name="field"/>
+                <Option type="int" value="2" name="type"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14856,8 +14856,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14866,8 +14866,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14876,8 +14876,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14891,40 +14891,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="page" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="page" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="page" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14971,7 +14971,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -15036,7 +15036,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15047,7 +15047,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="1" cascadedDelete="0" editable="0" targetFieldName="position" joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1">
+        <join joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" targetFieldName="position" editable="0" cascadedDelete="0" memoryCache="1" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -15075,58 +15075,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="id" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="id" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="114,155,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15157,36 +15157,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -15201,44 +15201,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15261,51 +15261,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show by day in marshal plan" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day in marshal plan" symbol="0"/>
+          <rule checkstate="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Always show in marshal plan" symbol="1"/>
+          <rule checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol alpha="0.8" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15328,42 +15328,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.8" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15386,42 +15386,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.01" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.01" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15444,9 +15444,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15457,40 +15457,40 @@ def my_form_open(dialog, layer, feature):
         <rules key="{e2cfe0de-49d9-4c26-9f28-7c441fcd9406}">
           <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{6554fdac-c88c-4a54-906c-4410d068210b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -15513,34 +15513,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15555,118 +15555,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{a4dd1032-0030-4a6b-9402-5837f38a97d7}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -15689,34 +15689,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15731,110 +15731,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{9c1b3f4f-60f7-4728-a973-105f4a2bf2a9}" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.5" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.5">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15849,189 +15849,189 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{0a116ab9-23e3-44ab-a89c-47d8c9d3bbc7}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.59999999999999998">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -16054,34 +16054,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -16096,148 +16096,148 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{5fea8fd6-270f-470f-9388-15325712ca1d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,0,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.90000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="133,182,111,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="133,182,111,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -16260,34 +16260,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -16302,108 +16302,108 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="10" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="10"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -16412,148 +16412,153 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -16562,47 +16567,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16633,9 +16638,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16643,16 +16648,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16663,8 +16668,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16673,8 +16678,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16683,8 +16688,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16693,8 +16698,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16703,8 +16708,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16734,8 +16739,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16784,95 +16789,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_day" index="6" name=""/>
-        <alias field="csv_position" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captain" index="9" name=""/>
-        <alias field="csv_captain_phone" index="10" name=""/>
-        <alias field="csv_race" index="11" name=""/>
-        <alias field="csv_first_runner" index="12" name=""/>
-        <alias field="csv_last_runner" index="13" name=""/>
-        <alias field="csv_instructions" index="14" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="xyposition" name=""/>
+        <alias index="5" field="day" name=""/>
+        <alias index="6" field="csv_day" name=""/>
+        <alias index="7" field="csv_position" name=""/>
+        <alias index="8" field="csv_club" name=""/>
+        <alias index="9" field="csv_captain" name=""/>
+        <alias index="10" field="csv_captain_phone" name=""/>
+        <alias index="11" field="csv_race" name=""/>
+        <alias index="12" field="csv_first_runner" name=""/>
+        <alias index="13" field="csv_last_runner" name=""/>
+        <alias index="14" field="csv_instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="notes" applyOnUpdate="0" expression=""/>
-        <default field="xyposition" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="csv_day" applyOnUpdate="0" expression=""/>
-        <default field="csv_position" applyOnUpdate="0" expression=""/>
-        <default field="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="csv_race" applyOnUpdate="0" expression=""/>
-        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="csv_day" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_race" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="notes" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="xyposition" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_club" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_captain" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_captain_phone" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_race" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_instructions" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="notes" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="xyposition" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_club" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_captain" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_captain_phone" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_race" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_first_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_last_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_instructions" exp_strength="0" notnull_strength="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_day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_captain" desc="" exp=""/>
-        <constraint field="csv_captain_phone" desc="" exp=""/>
-        <constraint field="csv_race" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="xyposition" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="csv_day" exp=""/>
+        <constraint desc="" field="csv_position" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_captain" exp=""/>
+        <constraint desc="" field="csv_captain_phone" exp=""/>
+        <constraint desc="" field="csv_race" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="notes" hidden="0"/>
-          <column type="field" width="-1" name="xyposition" hidden="0"/>
-          <column type="field" width="-1" name="csv_day" hidden="0"/>
-          <column type="field" width="-1" name="csv_position" hidden="0"/>
-          <column type="field" width="-1" name="csv_club" hidden="0"/>
-          <column type="field" width="-1" name="csv_captain" hidden="0"/>
-          <column type="field" width="-1" name="csv_captain_phone" hidden="0"/>
-          <column type="field" width="-1" name="csv_race" hidden="0"/>
-          <column type="field" width="-1" name="csv_first_runner" hidden="0"/>
-          <column type="field" width="-1" name="csv_last_runner" hidden="0"/>
-          <column type="field" width="-1" name="csv_instructions" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="notes"/>
+          <column hidden="0" width="151" type="field" name="xyposition"/>
+          <column hidden="0" width="-1" type="field" name="csv_day"/>
+          <column hidden="0" width="-1" type="field" name="csv_position"/>
+          <column hidden="0" width="-1" type="field" name="csv_club"/>
+          <column hidden="0" width="-1" type="field" name="csv_captain"/>
+          <column hidden="0" width="-1" type="field" name="csv_captain_phone"/>
+          <column hidden="0" width="-1" type="field" name="csv_race"/>
+          <column hidden="0" width="-1" type="field" name="csv_first_runner"/>
+          <column hidden="0" width="-1" type="field" name="csv_last_runner"/>
+          <column hidden="0" width="-1" type="field" name="csv_instructions"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17079,7 +17084,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer wkbType="NoGeometry" refreshOnNotifyEnabled="0" autoRefreshTime="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="100000" geometry="No geometry" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" readOnly="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="vector" geometry="No geometry" maxScale="100000" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -17132,7 +17137,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17157,58 +17162,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17239,36 +17244,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -17283,44 +17288,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17343,9 +17348,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17354,16 +17359,16 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="first_name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17381,8 +17386,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17391,8 +17396,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17401,8 +17406,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17451,75 +17456,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="club" index="2" name=""/>
-        <alias field="captain" index="3" name=""/>
-        <alias field="captain_phone" index="4" name=""/>
-        <alias field="race" index="5" name=""/>
-        <alias field="first_runner" index="6" name=""/>
-        <alias field="last_runner" index="7" name=""/>
-        <alias field="distance" index="8" name=""/>
-        <alias field="instructions" index="9" name=""/>
+        <alias index="0" field="day" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="club" name=""/>
+        <alias index="3" field="captain" name=""/>
+        <alias index="4" field="captain_phone" name=""/>
+        <alias index="5" field="race" name=""/>
+        <alias index="6" field="first_runner" name=""/>
+        <alias index="7" field="last_runner" name=""/>
+        <alias index="8" field="distance" name=""/>
+        <alias index="9" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="captain" applyOnUpdate="0" expression=""/>
-        <default field="captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="race" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="race" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="club" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="captain" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="captain_phone" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="race" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="first_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="last_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="instructions" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="club" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="captain" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="captain_phone" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="race" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="first_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="last_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="instructions" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="race" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="race" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="221" name="name" hidden="0"/>
-          <column type="field" width="-1" name="club" hidden="0"/>
-          <column type="field" width="-1" name="phone" hidden="0"/>
-          <column type="field" width="-1" name="email" hidden="0"/>
-          <column type="field" width="-1" name="captain" hidden="0"/>
-          <column type="field" width="-1" name="races" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="first_runner" hidden="0"/>
-          <column type="field" width="-1" name="last_runner" hidden="0"/>
-          <column type="field" width="-1" name="instructions" hidden="0"/>
-          <column type="field" width="-1" name="firstname" hidden="0"/>
-          <column type="field" width="-1" name="surname" hidden="0"/>
-          <column type="field" width="-1" name="captain_phone" hidden="0"/>
-          <column type="field" width="-1" name="days" hidden="0"/>
-          <column type="field" width="-1" name="captain_email" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="221" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="club"/>
+          <column hidden="0" width="-1" type="field" name="phone"/>
+          <column hidden="0" width="-1" type="field" name="email"/>
+          <column hidden="0" width="-1" type="field" name="captain"/>
+          <column hidden="0" width="-1" type="field" name="races"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="first_runner"/>
+          <column hidden="0" width="-1" type="field" name="last_runner"/>
+          <column hidden="0" width="-1" type="field" name="instructions"/>
+          <column hidden="0" width="-1" type="field" name="firstname"/>
+          <column hidden="0" width="-1" type="field" name="surname"/>
+          <column hidden="0" width="-1" type="field" name="captain_phone"/>
+          <column hidden="0" width="-1" type="field" name="days"/>
+          <column hidden="0" width="-1" type="field" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17620,7 +17625,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -17685,7 +17690,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17710,58 +17715,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="141,90,153,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17792,36 +17797,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -17836,44 +17841,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17896,58 +17901,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17978,50 +17983,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -18052,30 +18057,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18095,33 +18100,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -18137,32 +18142,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -18177,9 +18182,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -18192,11 +18197,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18205,47 +18210,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18276,9 +18281,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18286,16 +18291,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18318,30 +18323,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18386,7 +18391,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -18451,7 +18456,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18476,58 +18481,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="232,113,141,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18558,36 +18563,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -18602,44 +18607,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18662,44 +18667,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.75" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8.5" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8.5" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.75">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1.5" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1.5" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18714,109 +18719,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_x" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_y" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="1" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="PreventOverlap" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="0.20000000000000001" scaleMin="1"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="1" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="2" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18825,47 +18830,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18896,9 +18901,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18906,16 +18911,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18926,8 +18931,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18936,8 +18941,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18946,8 +18951,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18956,8 +18961,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18966,8 +18971,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18976,8 +18981,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18986,8 +18991,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18996,8 +19001,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19006,73 +19011,73 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="osm_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="z_order" applyOnUpdate="0" expression=""/>
-        <default field="population" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="osm_id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="z_order" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="population" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_x" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_y" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="osm_id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="z_order" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="population" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_x" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_y" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_rota" exp_strength="0" notnull_strength="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 desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="osm_id" hidden="0"/>
-          <column type="field" width="-1" name="name" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="z_order" hidden="0"/>
-          <column type="field" width="-1" name="population" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="label_x" hidden="0"/>
-          <column type="field" width="-1" name="label_y" hidden="0"/>
-          <column type="field" width="-1" name="label_rota" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="osm_id"/>
+          <column hidden="0" width="-1" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="z_order"/>
+          <column hidden="0" width="-1" type="field" name="population"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="label_x"/>
+          <column hidden="0" width="-1" type="field" name="label_y"/>
+          <column hidden="0" width="-1" type="field" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19131,7 +19136,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -19196,7 +19201,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19221,58 +19226,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,158,23,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19303,36 +19308,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -19347,44 +19352,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19407,52 +19412,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="7" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="7" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.80000000000000004">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="196,60,57,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19475,34 +19480,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19517,118 +19522,118 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MapUnit" priority="3" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="PreventOverlap" placement="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="5" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="0.29999999999999999" scaleMin="1"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="3" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" placementFlags="4" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="1" minFeatureSize="5" scaleMax="10000000" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="always_sho" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="&quot;&quot;" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -19637,47 +19642,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -19708,9 +19713,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19718,16 +19723,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19738,8 +19743,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19748,8 +19753,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19793,8 +19798,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19857,100 +19862,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <defaults>
-        <default field="osm_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="highway" applyOnUpdate="0" expression=""/>
-        <default field="waterway" applyOnUpdate="0" expression=""/>
-        <default field="aerialway" applyOnUpdate="0" expression=""/>
-        <default field="barrier" applyOnUpdate="0" expression=""/>
-        <default field="man_made" applyOnUpdate="0" expression=""/>
-        <default field="z_order" applyOnUpdate="0" expression=""/>
-        <default field="other_tags" applyOnUpdate="0" expression=""/>
-        <default field="never_show" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rota" applyOnUpdate="0" expression=""/>
-        <default field="always_sho" applyOnUpdate="0" expression=""/>
-        <default field="resident_a" applyOnUpdate="0" expression=""/>
-        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
+        <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="highway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="waterway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="aerialway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="barrier" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="man_made" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="z_order" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="other_tags" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="never_show" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_x" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_y" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="always_sho" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="resident_a" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="osm_id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="highway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="waterway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="aerialway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="barrier" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="man_made" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="z_order" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="other_tags" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="never_show" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_x" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_y" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_rota" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="always_sho" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="resident_a" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" notnull_strength="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 desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="osm_id" hidden="0"/>
-          <column type="field" width="160" name="name" hidden="0"/>
-          <column type="field" width="-1" name="z_order" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="highway" hidden="0"/>
-          <column type="field" width="-1" name="waterway" hidden="0"/>
-          <column type="field" width="-1" name="aerialway" hidden="0"/>
-          <column type="field" width="-1" name="barrier" hidden="0"/>
-          <column type="field" width="-1" name="man_made" hidden="0"/>
-          <column type="field" width="142" name="other_tags" hidden="0"/>
-          <column type="field" width="-1" name="never_show" hidden="0"/>
-          <column type="field" width="-1" name="label_x" hidden="0"/>
-          <column type="field" width="-1" name="label_y" hidden="0"/>
-          <column type="field" width="-1" name="label_rota" hidden="0"/>
-          <column type="field" width="-1" name="always_sho" hidden="0"/>
-          <column type="field" width="-1" name="resident_a" hidden="0"/>
-          <column type="field" width="-1" name="auxiliary_storage_labeling_show" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="osm_id"/>
+          <column hidden="0" width="160" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="z_order"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="highway"/>
+          <column hidden="0" width="-1" type="field" name="waterway"/>
+          <column hidden="0" width="-1" type="field" name="aerialway"/>
+          <column hidden="0" width="-1" type="field" name="barrier"/>
+          <column hidden="0" width="-1" type="field" name="man_made"/>
+          <column hidden="0" width="142" type="field" name="other_tags"/>
+          <column hidden="0" width="-1" type="field" name="never_show"/>
+          <column hidden="0" width="-1" type="field" name="label_x"/>
+          <column hidden="0" width="-1" type="field" name="label_y"/>
+          <column hidden="0" width="-1" type="field" name="label_rota"/>
+          <column hidden="0" width="-1" type="field" name="always_sho"/>
+          <column hidden="0" width="-1" type="field" name="resident_a"/>
+          <column hidden="0" width="-1" type="field" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20119,7 +20124,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -20184,7 +20189,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20209,58 +20214,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="231,113,72,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20291,36 +20296,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -20335,44 +20340,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20395,54 +20400,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="star" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.5" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20465,47 +20470,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,32,80,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -20527,47 +20532,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -20589,57 +20594,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/road_closure.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -20661,47 +20666,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,12,254,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="255,255,255,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -20724,18 +20729,18 @@ def my_form_open(dialog, layer, feature):
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -20752,24 +20757,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -20792,10 +20797,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -20804,18 +20809,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -20832,24 +20837,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -20873,47 +20878,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="43,153,41,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -20935,15 +20940,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20952,32 +20957,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="2" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="0.69999999999999996" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="2" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="2" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="2" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -20992,99 +20997,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="2" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="3" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="3" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="2" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="2" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="10" obstacleFactor="1.8" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="2" preserveRotation="1" yOffset="3" xOffset="2" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="3" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="10"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="2" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21093,47 +21098,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21164,9 +21169,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21174,16 +21179,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21220,40 +21225,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="name" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21302,7 +21307,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -21375,58 +21380,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21457,36 +21462,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -21501,44 +21506,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21561,42 +21566,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="135" name="angle"/>
+                <Option type="QString" value="during_render" name="clip_mode"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="feature" name="coordinate_reference"/>
+                <Option type="QString" value="2" name="distance"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
+                <Option type="QString" value="MM" name="distance_unit"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -21615,48 +21620,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option type="QString" value="0" name="align_dash_pattern"/>
+                    <Option type="QString" value="square" name="capstyle"/>
+                    <Option type="QString" value="5;2" name="customdash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="customdash_unit"/>
+                    <Option type="QString" value="0" name="dash_pattern_offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                    <Option type="QString" value="0" name="draw_inside_polygon"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="211,134,33,255" name="line_color"/>
+                    <Option type="QString" value="solid" name="line_style"/>
+                    <Option type="QString" value="0.3" name="line_width"/>
+                    <Option type="QString" value="MM" name="line_width_unit"/>
+                    <Option type="QString" value="0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0" name="ring_filter"/>
+                    <Option type="QString" value="0" name="trim_distance_end"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                    <Option type="QString" value="0" name="trim_distance_start"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                    <Option type="QString" value="0" name="use_custom_dash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -21687,27 +21692,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.46" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="no" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -21722,9 +21727,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21735,11 +21740,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21748,47 +21753,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21819,9 +21824,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21829,16 +21834,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21854,26 +21859,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="FID" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="431" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="431" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21918,7 +21923,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21983,7 +21988,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22008,58 +22013,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,207,80,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22090,36 +22095,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -22134,44 +22139,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22194,61 +22199,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
-          <rule symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
-          <rule symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open" symbol="0"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking" symbol="1"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" symbol="2"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way" symbol="3"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22279,50 +22284,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="2" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22342,40 +22347,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="1" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22398,52 +22403,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="2;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash dot dot" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22474,41 +22479,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22528,46 +22533,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22590,58 +22595,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="3;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22672,41 +22677,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22726,46 +22731,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22788,58 +22793,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22870,20 +22875,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22892,32 +22897,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="9" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="times" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="times" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="9" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -22932,67 +22937,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23001,47 +23006,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23072,9 +23077,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23082,16 +23087,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23128,40 +23133,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="times" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="status" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="times" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="status" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="times" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="202" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="status" hidden="0"/>
-          <column type="field" width="-1" name="times" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="202" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="status"/>
+          <column hidden="0" width="-1" type="field" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23210,7 +23215,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37569038998762494</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -23283,58 +23288,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23365,36 +23370,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -23409,44 +23414,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23469,54 +23474,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
           <rule description="Active routes" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -23539,34 +23544,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -23581,138 +23586,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -23735,34 +23740,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -23777,98 +23782,98 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -23876,32 +23881,32 @@ def my_form_open(dialog, layer, feature):
           <rule description="List for legends" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0">
             <rule description="21KM" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" filter="&quot;Source&quot; = '21KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="210,32,39,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="210,32,39,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -23916,130 +23921,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="10KM" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" filter="&quot;Source&quot; = '10KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="103,34,144,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="103,34,144,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -24054,130 +24059,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="5KM" key="{693188a6-ae99-4fd2-859f-1606793dda66}" filter="&quot;Source&quot; = '5KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="145,211,55,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="145,211,55,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -24192,138 +24197,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="Trail" key="{ba58e108-c24a-410e-9584-a7819af049ef}" filter="&quot;Source&quot; = 'Trail'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="145,211,55,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option type="QString" value="0" name="angle"/>
+                          <Option type="QString" value="square" name="cap_style"/>
+                          <Option type="QString" value="133,182,111,255" name="color"/>
+                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                          <Option type="QString" value="bevel" name="joinstyle"/>
+                          <Option type="QString" value="circle" name="name"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="0" name="outline_width"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="diameter" name="scale_method"/>
+                          <Option type="QString" value="2" name="size"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="size_unit"/>
+                          <Option type="QString" value="1" name="vertical_anchor_point"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -24346,34 +24351,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="0,72,255,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -24388,77 +24393,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -24468,13 +24473,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -24483,47 +24488,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24554,9 +24559,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24564,16 +24569,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24584,8 +24589,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24594,8 +24599,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24604,8 +24609,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24614,8 +24619,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24624,8 +24629,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24634,8 +24639,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24644,8 +24649,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24654,8 +24659,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24678,8 +24683,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24688,8 +24693,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24698,8 +24703,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24708,8 +24713,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24723,95 +24728,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
+        <alias index="12" field="org_fid" name=""/>
+        <alias index="13" field="distance" name=""/>
+        <alias index="14" field="quadrant" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
-        <default field="org_fid" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="quadrant" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Sort" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Sort" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="org_fid" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="quadrant" exp_strength="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_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 desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="org_fid" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="-1" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="field" width="-1" name="length_km" hidden="0"/>
-          <column type="field" width="-1" name="Sort" hidden="0"/>
-          <column type="field" width="-1" name="quadrant" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="length_m" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="org_fid"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="-1" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="0" width="-1" type="field" name="length_km"/>
+          <column hidden="0" width="-1" type="field" name="Sort"/>
+          <column hidden="0" width="-1" type="field" name="quadrant"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24898,7 +24903,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24971,58 +24976,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25053,36 +25058,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -25097,44 +25102,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25157,38 +25162,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -25203,9 +25208,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25216,18 +25221,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -25257,35 +25262,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="area" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="area" expression="" applyOnUpdate="0"/>
+        <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="area" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="rotation" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="area" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="rotation" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="area" hidden="0"/>
-          <column type="field" width="-1" name="rotation" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="area"/>
+          <column hidden="0" width="-1" type="field" name="rotation"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25308,7 +25313,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25373,7 +25378,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25398,58 +25403,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25480,36 +25485,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -25524,44 +25529,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25584,49 +25589,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25649,20 +25654,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25674,15 +25679,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -25691,47 +25696,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25762,9 +25767,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25772,16 +25777,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25813,8 +25818,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25830,8 +25835,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25840,8 +25845,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25890,85 +25895,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="org_fid" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="first_runn" applyOnUpdate="0" expression=""/>
-        <default field="last_runne" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="first_runn" expression="" applyOnUpdate="0"/>
+        <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="first_runn" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="last_runne" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="org_fid" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="first_runn" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="last_runne" exp_strength="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="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 desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="179" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="length_m" hidden="0"/>
-          <column type="field" width="-1" name="length_km" hidden="0"/>
-          <column type="field" width="-1" name="org_fid" hidden="0"/>
-          <column type="field" width="-1" name="first_runn" hidden="0"/>
-          <column type="field" width="-1" name="last_runne" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column hidden="0" width="179" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="length_m"/>
+          <column hidden="0" width="-1" type="field" name="length_km"/>
+          <column hidden="0" width="-1" type="field" name="org_fid"/>
+          <column hidden="0" width="-1" type="field" name="first_runn"/>
+          <column hidden="0" width="-1" type="field" name="last_runne"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26059,7 +26064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26132,58 +26137,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26214,36 +26219,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -26258,44 +26263,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26318,58 +26323,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26400,50 +26405,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -26474,30 +26479,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -26517,33 +26522,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -26559,32 +26564,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -26599,9 +26604,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -26614,11 +26619,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26627,47 +26632,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26698,9 +26703,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26708,16 +26713,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26740,30 +26745,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26808,7 +26813,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26881,58 +26886,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26963,36 +26968,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -27007,44 +27012,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27067,44 +27072,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="15" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="label" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="label" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="15" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27119,66 +27124,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27187,47 +27192,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27258,9 +27263,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27268,16 +27273,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27300,30 +27305,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="label" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="label"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27368,7 +27373,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -27433,7 +27438,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -27458,58 +27463,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27540,36 +27545,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -27584,44 +27589,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27644,54 +27649,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
           <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="75" legendString="Aa" namedStyle="Bold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="31,120,180,255" blendMode="0" fieldName="label" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="label" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="75" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="31,120,180,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Bold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="0.75" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,204" shapeOffsetY="-0.14999999999999999" shapeBorderWidth="0.75" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="0.75" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeType="0" shapeSizeY="0.29999999999999999" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.75" shapeOffsetY="-0.14999999999999999" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -27714,34 +27719,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,204" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.75" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -27756,56 +27761,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" xOffset="1" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="1" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="6" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="0.76000000000000001" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PolygonGeometry" quadOffset="1" preserveRotation="1" yOffset="0" xOffset="1" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="1" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="6" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -27814,17 +27819,17 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27833,47 +27838,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27904,9 +27909,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27914,22 +27919,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -27940,8 +27945,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27950,8 +27955,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27960,8 +27965,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27982,45 +27987,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="table_set" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="table_set" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="races" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="table_set" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="races" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="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 field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="table_set" hidden="0"/>
-          <column type="field" width="-1" name="label" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="130" name="races" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="table_set"/>
+          <column hidden="0" width="-1" type="field" name="label"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="130" type="field" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28435,363 +28440,363 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option type="QString" value="" name="name"/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option type="QString" value="collection" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Cones" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{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="1" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Fencing and Cones"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Fencing and Cones"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{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" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
       <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -28818,31 +28823,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshals">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28857,49 +28862,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" id="" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28914,9 +28919,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28924,15 +28929,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="19.9422,32,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="5" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="128.508,3.98741,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="bevel" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.1,mm" position="128.508,3.98741,mm" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="128.508,3.98741,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="5" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="19.9422,32,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" position="128.508,3.98741,mm" groupUuid="" frameJoinStyle="bevel">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28940,37 +28945,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28978,62 +28983,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal map - inset" type="65639" positionLock="true" outlineWidthM="0.2,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" itemRotation="0" mapRotation="0" position="98.7828,149.027,mm" size="56.5192,54.5647,mm" excludeFromExports="0" zValue="4" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="4" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" drawCanvasItems="false" followPresetName="Marshal map - inset" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Inset map" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="98.7828,149.027,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="56.5192,54.5647,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91232887817815111" xmax="18.42437871848258268" xmin="18.42008617785988278" ymin="-33.91647297528887606"/>
+        <Extent ymin="-33.91647297528887606" ymax="-33.91232887817815111" xmax="18.42437871848258268" xmin="18.42008617785988278"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29064,44 +29069,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29124,40 +29129,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29172,29 +29177,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29202,28 +29207,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1" inverted="0" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1" name="Overview 1">
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <ComposerMapOverview position="3" show="1" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" blendMode="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,65,170,127" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,102" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -29238,9 +29243,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29248,9 +29253,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29258,69 +29263,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal map - main" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" itemRotation="0" mapRotation="0" position="3.53,6.0007,mm" size="142,187.018,mm" excludeFromExports="0" zValue="3" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="3" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" drawCanvasItems="false" followPresetName="Marshal map - main" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Main map" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="3.53,6.0007,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="142,187.018,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91372455973290556" xmax="18.4227460039006381" xmin="18.42171889244182736" ymin="-33.91507729373412161"/>
+        <Extent ymin="-33.91507729373412161" ymax="-33.91372455973290556" xmax="18.4227460039006381" xmin="18.42171889244182736"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29351,44 +29356,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29411,40 +29416,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29459,29 +29464,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29489,22 +29494,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" sectionHeight="187.018" frame="false" referencePoint="2" sectionWidth="142.117" opacity="1" sectionX="0" type="65647" positionLock="true" outlineWidthM="0.3,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" id="" itemRotation="0" position="290.617,6.0007,mm" size="142.117,187.018,mm" excludeFromExports="0" zValue="2" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" groupUuid="" frameJoinStyle="round" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" hidePageIfEmpty="0" positionOnPage="290.617,6.0007,mm" hideBackgroundIfEmpty="0" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" groupUuid="" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" frameJoinStyle="round" blendMode="0" sectionX="0" hidePageIfEmpty="0" outlineWidthM="0.3,mm" sectionY="0" position="290.617,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" itemRotation="0" opacity="1" sectionWidth="142.117" sectionHeight="187.018" positionOnPage="290.617,6.0007,mm" excludeFromExports="0" referencePoint="2" size="142.117,187.018,mm" visibility="1" background="false">
+        <FrameColor alpha="255" blue="119" green="119" red="119"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29512,21 +29517,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="47.1065" pictureRotation="0" mapUuid="" anchorPoint="0" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="25.2491" svgFillColor="255,255,255,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" id="" itemRotation="0" position="246.665,178.41,mm" size="47.1065,27.6,mm" excludeFromExports="0" zValue="1" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" northMode="0" file="../GunRun2022_500.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="1" northMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" id="" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_500.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="246.665,178.41,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="0" opacity="1" pictureWidth="47.1065" svgFillColor="255,255,255,255" positionOnPage="246.665,178.41,mm" excludeFromExports="0" referencePoint="0" size="47.1065,27.6,mm" visibility="1" mapUuid="" background="false" pictureHeight="25.2491">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29534,14 +29539,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;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  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>" stylesheetEnabled="true" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" type="65648" useSmartBreaks="true" resizeMode="0" contentMode="1" 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;}">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" url="" useSmartBreaks="true" contentMode="1" type="65648" evaluateExpressions="true" uuid="{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;}" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  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">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29551,60 +29556,60 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" 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="0" type="QString" name="imageCropMarginUnit"/>
-          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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" 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="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="0" name="imageCropMarginUnit"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="rasterize"/>
+          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <Atlas enabled="1" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayerName="marshal_positions" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29619,49 +29624,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" id="" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29676,9 +29681,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29686,21 +29691,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="6.31767" pictureRotation="330" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="7.97477" svgFillColor="255,255,255,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" id="" itemRotation="0" position="286.027,2,mm" size="9.45865,11,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" northMode="0" file="arrows/NorthArrow_11.svg" mode="0" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" id="" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="arrows/NorthArrow_11.svg" frameJoinStyle="miter" blendMode="0" mode="0" pictureRotation="330" northOffset="0" outlineWidthM="0.3,mm" position="286.027,2,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="0" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" positionOnPage="286.027,2,mm" excludeFromExports="0" referencePoint="0" size="9.45865,11,mm" visibility="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" pictureHeight="7.97477">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29708,47 +29713,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="[%upper( &quot;area&quot; )%]" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" itemRotation="270" position="285.027,205.886,mm" size="142.543,10.3185,mm" excludeFromExports="0" marginX="1" zValue="3" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" id="" labelText="[%upper( &quot;area&quot; )%]" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="285.027,205.886,mm" marginY="1" type="65641" itemRotation="270" opacity="1" htmlState="0" positionOnPage="285.027,205.886,mm" excludeFromExports="0" referencePoint="0" halign="1" size="142.543,10.3185,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29763,65 +29768,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="100" size="145.54,16.2165,mm" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" background="false" style="Single Box" outlineWidth="0.3" zValue="2" height="3" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" positionOnPage="7,189.669,mm" segmentMillimeters="26.3519" blendMode="0" minBarWidth="50" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="3" labelHorizontalPlacement="0" lineJoinStyle="miter" frameJoinStyle="miter" visibility="1" maxBarWidth="150" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="1" alignment="0" lineCapStyle="square" position="7,189.669,mm" numSegments="4" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="7,189.669,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="4" segmentMillimeters="26.3519" excludeFromExports="0" maxBarWidth="150" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" id="" height="3" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="3" boxContentSpace="1" itemRotation="0" visibility="1" referencePoint="0" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" lineCapStyle="square" style="Single Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="miter" outlineWidth="0.3" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" position="7,189.669,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="100" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29836,75 +29841,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29935,52 +29940,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30011,52 +30016,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30087,36 +30092,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -30131,36 +30136,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30175,87 +30180,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Start/Finish" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" itemRotation="0" mapRotation="330" position="7,5.5,mm" size="278.027,180.318,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" positionOnPage="7,5.5,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" drawCanvasItems="false" followPresetName="Start/Finish" labelMargin="0,mm" mapRotation="330" groupUuid="" id="" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="7,5.5,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="7,5.5,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="278.027,180.318,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="rotation" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="id" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30286,44 +30291,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30346,9 +30351,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30365,32 +30370,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30405,29 +30410,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30435,65 +30440,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
+          <Option type="QString" value="0" name="svgCropMarginBottom"/>
+          <Option type="QString" value="0" name="svgCropMarginLeft"/>
+          <Option type="QString" value="0" name="svgCropMarginRight"/>
+          <Option type="QString" value="0" name="svgCropMarginTop"/>
+          <Option type="QString" value="true" name="svgCropToContents"/>
+          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
+          <Option type="QString" value="false" name="svgGroupLayers"/>
+          <Option type="QString" value="1" name="svgIncludeMetadata"/>
+          <Option type="QString" value="0" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;area&quot;" sortKey="area" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <Atlas enabled="1" sortKey="area" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayerName="start_finish_area" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Fencing">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30508,49 +30513,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" id="" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30565,9 +30570,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30575,15 +30580,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="38.1563,67.2879,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="11" titleAlignment="1" resizeToContents="0" boxSpace="2" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,5.21277,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="256.808,5.21277,mm" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="256.808,5.21277,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="11" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="0" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="38.1563,67.2879,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" position="256.808,5.21277,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30591,53 +30596,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" style="Bold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0" italic="0" bold="1" style="Bold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30645,47 +30650,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" itemRotation="0" position="6.76779,191.188,mm" size="148.46,6.45211,mm" excludeFromExports="0" marginX="0" zValue="10" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" id="" labelText="FENCING: [% &quot;name&quot; %]" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" referencePoint="0" halign="1" size="148.46,6.45211,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30700,65 +30705,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" id="" itemRotation="0" position="182.723,191.188,mm" size="56.3557,6.45237,mm" excludeFromExports="0" marginX="0" zValue="9" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" groupUuid="" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="182.723,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="182.723,191.188,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.3557,6.45237,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30773,65 +30778,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" itemRotation="0" position="209.146,198.083,mm" size="26.8205,6.82826,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="209.146,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="209.146,198.083,mm" excludeFromExports="0" referencePoint="0" halign="2" size="26.8205,6.82826,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30846,65 +30851,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" id="" itemRotation="0" position="62.6706,198.083,mm" size="51.1638,7.07327,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="51.1638,7.07327,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30919,65 +30924,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" itemRotation="0" position="116.805,198.083,mm" size="64.7594,7.10512,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="116.805,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="64.7594,7.10512,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30992,65 +30997,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% @atlas_featurenumber %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" itemRotation="0" position="6.76779,198.083,mm" size="52.7903,7.07327,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" id="" labelText="Page [% @atlas_featurenumber %]" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="52.7903,7.07327,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31065,39 +31070,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" id="" itemRotation="0" position="243.098,175.353,mm" size="49.3143,29.8354,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" id="" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.098,175.353,mm" excludeFromExports="0" referencePoint="0" size="49.3143,29.8354,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31105,42 +31110,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" itemRotation="0" position="6.91779,197.79,mm" size="232.01,0.14328,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" shapeType="1" id="" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31155,55 +31160,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="20" size="109.51,15.8378,mm" groupUuid="" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" background="false" style="Double Box" outlineWidth="0.2" zValue="2" height="2" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="33.2496" blendMode="0" minBarWidth="25" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="1" labelHorizontalPlacement="0" lineJoinStyle="round" frameJoinStyle="miter" visibility="1" maxBarWidth="100" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="0.2" alignment="0" lineCapStyle="square" position="6.76779,2.8482,mm" numSegments="2" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="2" segmentMillimeters="33.2496" excludeFromExports="0" maxBarWidth="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" id="" height="2" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="1" boxContentSpace="0.2" itemRotation="0" visibility="1" referencePoint="0" size="109.51,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" lineCapStyle="square" style="Double Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="round" outlineWidth="0.2" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" position="6.76779,2.8482,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="20" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31218,75 +31223,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31317,52 +31322,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31393,52 +31398,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31469,36 +31474,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -31513,36 +31518,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31557,53 +31562,53 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="0.9" followPresetName="Fencing" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" itemRotation="0" mapRotation="0" position="6.76779,9.35102,mm" size="283.418,180.92,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" drawCanvasItems="false" followPresetName="Fencing" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" type="65639" itemRotation="0" opacity="0.9" positionOnPage="6.76779,9.35102,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="283.418,180.92,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90720180625844904" xmax="18.40522072458854552" xmin="18.40368928312333452" ymin="-33.90817940102682115"/>
+        <Extent ymin="-33.90817940102682115" ymax="-33.90720180625844904" xmax="18.40522072458854552" xmin="18.40368928312333452"/>
         <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>
@@ -31618,45 +31623,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31687,44 +31692,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31747,9 +31752,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31766,32 +31771,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31806,29 +31811,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31836,65 +31841,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" 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="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="fence_and_cone_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <Atlas enabled="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerName="fence_and_cone_groups" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="9" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="9" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31909,49 +31914,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" id="" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31966,59 +31971,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="64" visibility="1" labelText="Directions to Start of Race" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" itemRotation="0" position="4.43449,186.634,mm" size="83.9998,10.4638,mm" excludeFromExports="0" marginX="1" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" id="" labelText="Directions to Start of Race" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="4.43449,186.634,mm" excludeFromExports="0" referencePoint="0" halign="1" size="83.9998,10.4638,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32033,65 +32038,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Gun Run" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" itemRotation="0" position="4.43449,197.498,mm" size="48.2923,9.511,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" id="" labelText="Gun Run" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="4.43449,197.498,mm" excludeFromExports="0" referencePoint="0" halign="1" size="48.2923,9.511,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32106,33 +32111,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem size="59.0766,76,mm" symbolHeight="5" lineSpacing="2" groupUuid="" itemRotation="0" background="true" columnSpace="0" zValue="6" legendFilterByMap="1" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="false" splitLayer="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendHeight="25" referencePoint="0" symbolWidth="9" id="" fontColor="#000000" frameJoinStyle="round" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="10.096,10.8563,mm" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="0" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="139" red="139" green="139"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="10.096,10.8563,mm" wmsLegendHeight="25" positionLock="false" symbolHeight="5" zValue="6" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" legendFilterByMap="1" excludeFromExports="0" fontColor="#000000" lineSpacing="2" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" id="" splitLayer="0" symbolWidth="9" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="0" size="59.0766,76,mm" titleAlignment="1" columnSpace="0" title="" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" position="10.096,10.8563,mm" groupUuid="" frameJoinStyle="round">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32140,52 +32145,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="subgroup">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="3" alignment="1" name="symbolLabel" marginTop="2.5">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="3" marginTop="2.5" name="symbolLabel">
+            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Ask Me">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option type="QString" value="hidden" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="poi_labels" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
+                  <Option type="QString" value="Toilets" name="legend/label-1"/>
+                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
+                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
+                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
+                  <Option type="QString" value="Parking" name="legend/label-5"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="directions_to_start" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
+                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
+                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32193,47 +32198,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 1.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" itemRotation="0" position="221.862,190.027,mm" size="27.7839,6.871,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" id="" labelText="REVISION 1.0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="221.862,190.027,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="221.862,190.027,mm" excludeFromExports="0" referencePoint="0" halign="2" size="27.7839,6.871,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32248,65 +32253,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" itemRotation="0" position="197.975,197.498,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="4" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="197.975,197.498,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="197.975,197.498,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32321,39 +32326,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="24.2337" pictureRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" opacity="1" type="65640" positionLock="false" outlineWidthM="0.3,mm" pictureHeight="24.3824" svgFillColor="255,255,255,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" id="" itemRotation="0" position="249.646,179.724,mm" size="42.9838,24.3824,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" id="" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" svgBorderWidth="0.2" positionLock="false" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="249.646,179.724,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" positionOnPage="249.646,179.724,mm" excludeFromExports="0" referencePoint="0" size="42.9838,24.3824,mm" visibility="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" pictureHeight="24.3824">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32361,42 +32366,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="false" outlineWidthM="0.3,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" itemRotation="0" position="4.58449,197.248,mm" size="244.912,0.1,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" shapeType="1" id="" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="4.58449,197.248,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32411,46 +32416,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Ask Me" type="65639" positionLock="false" outlineWidthM="0.3,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" itemRotation="0" mapRotation="0" position="4.43449,6.411,mm" size="288.007,183.616,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" drawCanvasItems="false" followPresetName="Ask Me" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="4.43449,6.411,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="288.007,183.616,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <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>
@@ -32465,45 +32470,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32534,44 +32539,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32594,40 +32599,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32642,29 +32647,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32672,56 +32677,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" filterFeatures="0" sortFeatures="0" pageNameExpression="" hideCoverage="0" coverageLayer=""/>
+      <Atlas enabled="0" filterFeatures="0" coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="" name="Routes">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32736,49 +32741,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" id="" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32793,59 +32798,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" itemRotation="0" position="200.171,199.082,mm" size="61.5373,6.8714,mm" excludeFromExports="0" marginX="0" zValue="13" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="200.171,199.082,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="200.171,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="61.5373,6.8714,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32860,65 +32865,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" itemRotation="0" position="9.7863,192.073,mm" size="61.5373,6.60801,mm" excludeFromExports="0" marginX="0" zValue="12" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" id="" labelText="Gun Run 2022: [%&quot;Source&quot;%]" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.7863,192.073,mm" excludeFromExports="0" referencePoint="0" halign="1" size="61.5373,6.60801,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32933,65 +32938,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" itemRotation="0" position="9.7863,199.082,mm" size="61.5373,6.60801,mm" excludeFromExports="0" marginX="0" zValue="11" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" id="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.7863,199.082,mm" excludeFromExports="0" referencePoint="0" halign="1" size="61.5373,6.60801,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33006,39 +33011,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="29.7523" pictureRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="15.9472" svgFillColor="255,255,255,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="10" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" northMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" id="" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" pictureHeight="15.9472">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33046,42 +33051,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" itemRotation="0" position="9.57644,198.832,mm" size="251.982,0.1,mm" excludeFromExports="0" zValue="9" groupUuid="" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" positionOnPage="9.57644,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" shapeType="1" id="" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.57644,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33096,321 +33101,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" itemRotation="0" mapRotation="0" position="9.57644,5.42566,mm" size="107.861,186.385,mm" excludeFromExports="0" zValue="8" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" keepLayerSet="false" positionOnPage="9.57644,5.42566,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Trail Finish" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,5.42566,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.57644,5.42566,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="107.861,186.385,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" itemRotation="0" mapRotation="0" position="112.643,4.09761,mm" size="179.156,189.279,mm" excludeFromExports="0" zValue="7" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" keepLayerSet="false" positionOnPage="112.643,4.09761,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Trail Start" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="112.643,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="112.643,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="179.156,189.279,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" itemRotation="0" mapRotation="0" position="5.86559,4.09761,mm" size="67.7828,166.874,mm" excludeFromExports="0" zValue="6" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" drawCanvasItems="false" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Left inset 21KM" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.86559,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="67.7828,166.874,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" itemRotation="0" mapRotation="0" position="133.191,119.125,mm" size="113.3,76.1023,mm" excludeFromExports="0" zValue="5" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" positionOnPage="133.191,119.125,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="144" red="103" green="34"/>
-        <BackgroundColor alpha="255" blue="215" red="200" green="175"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Bottom inset 21KM" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="133.191,119.125,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="133.191,119.125,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="113.3,76.1023,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" id="End inset Trail" itemRotation="0" mapRotation="0" position="19.6693,7.89412,mm" size="68.3676,117.12,mm" excludeFromExports="0" zValue="4" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" keepLayerSet="false" positionOnPage="19.6693,7.89412,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="End inset Trail" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="19.6693,7.89412,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="19.6693,7.89412,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="68.3676,117.12,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" id="Start inset Trail" itemRotation="0" mapRotation="0" position="170.062,49.6297,mm" size="63.655,88.3012,mm" excludeFromExports="0" zValue="3" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" keepLayerSet="false" positionOnPage="170.062,49.6297,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Start inset Trail" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="170.062,49.6297,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="170.062,49.6297,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="63.655,88.3012,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" id="Contour inset Trail" itemRotation="0" mapRotation="0" position="200.321,125.314,mm" size="75.8756,69.7635,mm" excludeFromExports="0" zValue="2" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" keepLayerSet="false" positionOnPage="200.321,125.314,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Contour inset Trail" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="200.321,125.314,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="200.321,125.314,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="75.8756,69.7635,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="false" outlineWidthM="0.15,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" itemRotation="0" mapRotation="0" position="9.50144,5.50066,mm" size="282.372,186.105,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" positionOnPage="9.50144,5.50066,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Main Map" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" positionLock="false" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.50144,5.50066,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="282.372,186.105,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975544251798567" xmax="18.45388998618362919" xmin="18.36400000000000077" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" ymax="-33.89975544251798567" xmax="18.45388998618362919" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33441,44 +33446,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33501,40 +33506,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33549,29 +33554,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33579,34 +33584,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" show="1" inverted="0" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0" name="Overview 1">
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <ComposerMapOverview position="3" show="1" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" blendMode="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="103,34,144,26" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -33621,9 +33626,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33631,9 +33636,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33641,63 +33646,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" enabled="1" filterFeatures="1" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <Atlas enabled="1" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshal Plan A1">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33712,49 +33717,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" itemRotation="0" position="0,0,mm" size="594,841,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" id="" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="594,841,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33769,9 +33774,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33779,15 +33784,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="4,4,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="8" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="false" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="25.5925,18.7971,mm" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="25.5925,18.7971,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="8" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="false" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="4,4,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" position="25.5925,18.7971,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33795,37 +33800,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0">
+            <layer-tree-layer expanded="1" checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="QString" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33833,47 +33838,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="MARSHAL POSITIONS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" itemRotation="0" position="5.2963,808.939,mm" size="91.9494,15.0649,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" id="" labelText="MARSHAL POSITIONS" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="5.2963,808.939,mm" excludeFromExports="0" referencePoint="0" halign="1" size="91.9494,15.0649,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33888,65 +33893,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 1.2" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" itemRotation="0" position="430.403,825.052,mm" size="56.6212,15.3656,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" id="" labelText="REVISION 1.2" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="430.403,825.052,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="430.403,825.052,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.6212,15.3656,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33961,65 +33966,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" itemRotation="0" position="372.175,808.942,mm" size="114.848,15.0635,mm" excludeFromExports="0" marginX="1" zValue="4" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="372.175,808.942,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="372.175,808.942,mm" excludeFromExports="0" referencePoint="0" halign="2" size="114.848,15.0635,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34034,39 +34039,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="63.5856" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="63.9757" svgFillColor="255,255,255,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" id="" itemRotation="0" position="489.557,775.395,mm" size="100.498,63.9757,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" id="" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="489.557,775.395,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" positionOnPage="489.557,775.395,mm" excludeFromExports="0" referencePoint="0" size="100.498,63.9757,mm" visibility="1" mapUuid="" background="false" pictureHeight="63.9757">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34074,42 +34079,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" itemRotation="0" position="5.4463,824.155,mm" size="481.428,0.606138,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" shapeType="1" id="" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="5.4463,824.155,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34124,90 +34129,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal plan" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" itemRotation="0" mapRotation="0" position="3.94474,5.25965,mm" size="584.759,811.213,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" drawCanvasItems="false" followPresetName="Marshal plan" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="3.94474,5.25965,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="584.759,811.213,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;page&quot;" sortKey="page" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <Atlas enabled="1" sortKey="page" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerName="complete_marshal_overview" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="" name="Access Roads">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34222,49 +34227,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" id="" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34279,27 +34284,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="34.45,40.8,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="15" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="244.484,130.172,mm" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="0" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="244.484,130.172,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="15" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="0" size="34.45,40.8,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" position="244.484,130.172,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34307,35 +34312,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Residents Access">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="residents_access_roads" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34343,47 +34348,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" itemRotation="0" position="9.37446,191.81,mm" size="194.851,7.272,mm" excludeFromExports="0" marginX="0" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" id="" labelText="ACCESS ROUTES FOR RESIDENTS" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" referencePoint="0" halign="1" size="194.851,7.272,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34398,65 +34403,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="REVISION 1.1" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" itemRotation="0" position="204.225,191.81,mm" size="57.4836,6.8714,mm" excludeFromExports="0" marginX="1" zValue="6" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" id="" labelText="REVISION 1.1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="204.225,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" referencePoint="0" halign="2" size="57.4836,6.8714,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34471,65 +34476,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" itemRotation="0" position="210.038,199.082,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="210.038,199.082,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34544,39 +34549,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="17.3653" pictureRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="17.4718" svgFillColor="255,255,255,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" id="" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" pictureHeight="17.4718">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34584,42 +34589,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" itemRotation="0" position="9.59946,198.832,mm" size="251.959,0.1,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" shapeType="1" id="" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34634,61 +34639,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Access Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" itemRotation="0" mapRotation="0" position="5.86559,4.09761,mm" size="67.7828,166.874,mm" excludeFromExports="0" zValue="2" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" drawCanvasItems="false" followPresetName="Access Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.86559,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="67.7828,166.874,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <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>
@@ -34703,45 +34708,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34772,44 +34777,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34832,40 +34837,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34880,29 +34885,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34910,45 +34915,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Access Routes" type="65639" positionLock="true" outlineWidthM="0.15,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" itemRotation="0" mapRotation="0" position="9.44946,9.08557,mm" size="282.012,175.592,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" drawCanvasItems="false" followPresetName="Access Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" positionLock="true" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.44946,9.08557,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="282.012,175.592,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <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>
@@ -34963,45 +34968,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -35032,44 +35037,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35092,40 +35097,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35140,29 +35145,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35170,56 +35175,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <Atlas enabled="1" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35234,49 +35239,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" id="" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35291,59 +35296,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="64" visibility="1" labelText="Access to P9 Parking and VIP Tent" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" itemRotation="0" position="9.37446,191.81,mm" size="194.851,7.272,mm" excludeFromExports="0" marginX="0" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" id="" labelText="Access to P9 Parking and VIP Tent" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" referencePoint="0" halign="1" size="194.851,7.272,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35358,65 +35363,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="REVISION 1.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" itemRotation="0" position="204.225,191.81,mm" size="57.4836,6.8714,mm" excludeFromExports="0" marginX="1" zValue="6" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" id="" labelText="REVISION 1.0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="204.225,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" referencePoint="0" halign="2" size="57.4836,6.8714,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35431,65 +35436,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" itemRotation="0" position="210.038,199.082,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="210.038,199.082,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35504,39 +35509,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="17.3653" pictureRotation="0" mapUuid="" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="17.4718" svgFillColor="255,255,255,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" id="" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="" background="false" pictureHeight="17.4718">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35544,42 +35549,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" itemRotation="0" position="9.59946,198.832,mm" size="251.959,0.1,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" shapeType="1" id="" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35594,46 +35599,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="false" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="" type="65639" positionLock="false" outlineWidthM="0.15,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" itemRotation="0" mapRotation="0" position="9.44946,7.25098,mm" size="282.012,182.649,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" drawCanvasItems="false" followPresetName="" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" positionLock="false" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.44946,7.25098,mm" excludeFromExports="0" referencePoint="0" followPreset="false" size="282.012,182.649,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <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>
@@ -35648,45 +35653,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -35717,44 +35722,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35777,40 +35782,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35825,29 +35830,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35855,56 +35860,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <Atlas enabled="0" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshal Plan">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35919,49 +35924,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" itemRotation="0" position="0,0,mm" size="297,420,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" id="" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,420,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35976,9 +35981,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35986,47 +35991,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% &quot;page&quot; %] " marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" id="" itemRotation="0" position="112.086,406.476,mm" size="23.5967,8.3142,mm" excludeFromExports="0" marginX="0" zValue="9" halign="4" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" groupUuid="" id="" labelText="Page [% &quot;page&quot; %] " templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="112.086,406.476,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="112.086,406.476,mm" excludeFromExports="0" referencePoint="0" halign="4" size="23.5967,8.3142,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36041,65 +36046,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" itemRotation="0" position="214.292,406.874,mm" size="27.7839,7.51682,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="214.292,406.874,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="214.292,406.874,mm" excludeFromExports="0" referencePoint="0" halign="2" size="27.7839,7.51682,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36114,33 +36119,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem size="21.6797,33,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="7" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" positionOnPage="15.6525,12.5708,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="false" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="15.6525,12.5708,mm" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="15.6525,12.5708,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="7" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="false" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="21.6797,33,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" position="15.6525,12.5708,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36148,37 +36153,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36186,47 +36191,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="MARSHAL POSITIONS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" itemRotation="0" position="5.69321,398.344,mm" size="45.1194,8.13137,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" id="" labelText="MARSHAL POSITIONS" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="5.69321,398.344,mm" excludeFromExports="0" referencePoint="0" halign="1" size="45.1194,8.13137,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36241,65 +36246,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" 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>" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" id="" itemRotation="0" position="5.69321,406.988,mm" size="118.192,7.80192,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" groupUuid="" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="5.69321,406.988,mm" excludeFromExports="0" referencePoint="0" halign="1" size="118.192,7.80192,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36314,65 +36319,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" 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>" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" id="" itemRotation="0" position="148.501,398.344,mm" size="93.5757,8.13167,mm" excludeFromExports="0" marginX="0" zValue="4" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" groupUuid="" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="148.501,398.344,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="148.501,398.344,mm" excludeFromExports="0" referencePoint="0" halign="2" size="93.5757,8.13167,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36387,39 +36392,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" id="" itemRotation="0" position="243.319,382.696,mm" size="49.3143,31.2967,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" id="" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.319,382.696,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.319,382.696,mm" excludeFromExports="0" referencePoint="0" size="49.3143,31.2967,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36427,42 +36432,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" itemRotation="0" position="5.84321,406.626,mm" size="236.083,0.14328,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" shapeType="1" id="" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="5.84321,406.626,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -36477,97 +36482,97 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal plan" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" itemRotation="0" mapRotation="0" position="5.03,5.9483,mm" size="286.94,392.396,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" drawCanvasItems="false" followPresetName="Marshal plan" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.03,5.9483,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="286.94,392.396,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226"/>
+        <Extent ymin="-33.91890002608484167" ymax="-33.89580042337001231" xmax="18.41474568521422484" xmin="18.39785407807089612"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;page&quot;" sortKey="page" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <Atlas enabled="1" sortKey="page" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerName="marshal_overviews" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Fencing - Cones only">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -36582,49 +36587,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" id="" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -36639,9 +36644,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36649,15 +36654,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="38.1563,53.7608,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="11" titleAlignment="1" resizeToContents="0" boxSpace="2" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" positionOnPage="256.808,5.21277,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="256.808,5.21277,mm" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="256.808,5.21277,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="11" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="0" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="38.1563,53.7608,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" position="256.808,5.21277,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36665,53 +36670,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" style="Bold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0" italic="0" bold="1" style="Bold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36719,47 +36724,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="CONES: [% &quot;name&quot; %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" itemRotation="0" position="6.76779,191.188,mm" size="148.46,6.45211,mm" excludeFromExports="0" marginX="0" zValue="10" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionOnPage="6.76779,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" id="" labelText="CONES: [% &quot;name&quot; %]" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" referencePoint="0" halign="1" size="148.46,6.45211,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36774,65 +36779,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" id="" itemRotation="0" position="182.723,191.188,mm" size="56.3557,6.45237,mm" excludeFromExports="0" marginX="0" zValue="9" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" positionOnPage="182.723,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" groupUuid="" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="182.723,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="182.723,191.188,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.3557,6.45237,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36847,65 +36852,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" itemRotation="0" position="209.146,198.083,mm" size="26.8205,6.82826,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionOnPage="209.146,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="209.146,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="209.146,198.083,mm" excludeFromExports="0" referencePoint="0" halign="2" size="26.8205,6.82826,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36920,65 +36925,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" itemRotation="0" position="62.6706,198.083,mm" size="51.1638,7.07327,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionOnPage="62.6706,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="51.1638,7.07327,mm" visibility="0" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36993,65 +36998,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" id="" itemRotation="0" position="116.805,198.083,mm" size="64.7594,7.10512,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionOnPage="116.805,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="116.805,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="64.7594,7.10512,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37066,65 +37071,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% @atlas_featurenumber %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" itemRotation="0" position="6.76779,198.083,mm" size="90.2083,7.07327,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionOnPage="6.76779,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" id="" labelText="Page [% @atlas_featurenumber %]" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="90.2083,7.07327,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37139,39 +37144,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" resizeMode="0" id="" itemRotation="0" position="243.098,175.353,mm" size="49.3143,29.8354,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionOnPage="243.098,175.353,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" id="" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.098,175.353,mm" excludeFromExports="0" referencePoint="0" size="49.3143,29.8354,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37179,42 +37184,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" itemRotation="0" position="6.91779,197.79,mm" size="232.01,0.14328,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" shapeType="1" id="" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -37229,55 +37234,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="30" size="84.9787,15.8378,mm" groupUuid="" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" background="false" style="Double Box" outlineWidth="0.2" zValue="2" height="2" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="25.0725" blendMode="0" minBarWidth="25" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="1" labelHorizontalPlacement="0" lineJoinStyle="round" frameJoinStyle="miter" visibility="1" maxBarWidth="100" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="0.2" alignment="0" lineCapStyle="square" position="6.76779,2.8482,mm" numSegments="2" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="2" segmentMillimeters="25.0725" excludeFromExports="0" maxBarWidth="100" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" id="" height="2" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="1" boxContentSpace="0.2" itemRotation="0" visibility="1" referencePoint="0" size="84.9787,15.8378,mm" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" minBarWidth="25" lineCapStyle="square" style="Double Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="round" outlineWidth="0.2" labelVerticalPlacement="0" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" position="6.76779,2.8482,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="30" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37292,75 +37297,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37391,52 +37396,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37467,52 +37472,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37543,36 +37548,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -37587,36 +37592,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -37631,53 +37636,53 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="0.9" followPresetName="Cones" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" itemRotation="0" mapRotation="0" position="6.76779,9.35102,mm" size="283.418,180.92,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" drawCanvasItems="false" followPresetName="Cones" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" type="65639" itemRotation="0" opacity="0.9" positionOnPage="6.76779,9.35102,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="283.418,180.92,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90025472328818523" xmax="18.40975312970203248" xmin="18.40670677609450223" ymin="-33.90219936134110412"/>
+        <Extent ymin="-33.90219936134110412" ymax="-33.90025472328818523" xmax="18.40975312970203248" xmin="18.40670677609450223"/>
         <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>
@@ -37692,45 +37697,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -37761,44 +37766,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -37821,9 +37826,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -37840,32 +37845,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -37880,29 +37885,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37910,46 +37915,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" 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="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="cone_only_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <Atlas enabled="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerName="cone_only_groups" sortAscending="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90592672607977676" xmax="18.40637769723523931" xmin="18.40536111431805821" ymin="-33.90645936682980022">
+    <DefaultViewExtent ymin="-33.91526184066590588" ymax="-33.89776302520718332" xmax="18.42878819477711616" xmin="18.39625754142732106">
       <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>
@@ -37963,10 +37968,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
+  <ProjectTimeSettings frameRate="1" timeStep="1" timeStepUnit="h" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -37975,29 +37980,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="direction_format"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
+        <Option type="bool" value="false" name="show_leading_zeros"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="false" name="show_suffix"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index c189bb9..60b38fb 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 saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run" version="3.26.3-Buenos Aires" saveDateTime="2022-09-14T15:12:03">
+<qgis saveDateTime="2022-09-15T11:43:36" projectname="Gun Run" saveUserFull="Timothy Allen" version="3.26.3-Buenos Aires" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,222 +21,222 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Marshals">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="marshal_positions" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions [460]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="marshal_positions [460]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="extra_security" legend_split_behavior="0" source="./extra_security.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="extra_security" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="marshals_by_position" legend_split_behavior="0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
+      <layer-tree-layer providerKey="delimitedtext" expanded="1" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" type="QString" name="cached_name"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="marshals_by_position" name="cached_name"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="complete_marshal_overview" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="marshal_overviews" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews">
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="fencing" name="cached_name"/>
+            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="-1,-1" name="cone_only_groups" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="cone_only_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="-1,-1" name="fence_and_cone_groups" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
+      <layer-tree-layer providerKey="virtual" expanded="1" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Markers">
+      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" providerKey="memory" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="-1,-1" name="route_markers" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={1a51e78f-3249-44c4-a215-e94419bcf1dc}">
+        <layer-tree-layer providerKey="memory" expanded="1" checked="Qt::Checked" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" patch_size="-1,-1" legend_exp="" legend_split_behavior="0" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={d548dd66-2e8e-4421-b39d-f7aa3181f54d}">
           <customproperties>
             <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" value="1" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="all_routes" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="timelapse" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' ">
+    <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' ">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
+          <Option type="QString" value="timelapse" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Feeding Stations">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="water_tables" legend_split_behavior="0" source="./water_tables.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="water_tables" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Ask Me">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="poi_labels" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="directions_to_start" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start">
-        <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 groupLayer="" expanded="0" checked="Qt::Unchecked" name="Residents Access">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="mayor" legend_split_behavior="0" source="./mayor.shp">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="viplabels" legend_split_behavior="0" source="./viplabels.shp">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="vipaccess" legend_split_behavior="0" source="./vipaccess.shp">
+    </layer-tree-group>
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="QString" value="poi_labels" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="directions_to_start" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="mayor" source="./mayor.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="mayor" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="viplabels" source="./viplabels.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Unchecked" patch_size="0,0" name="golfaccess" legend_split_behavior="0" source="./golfaccess.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="vipaccess" source="./vipaccess.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="vipaccess" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="golfaccess" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="residents_access_roads" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="residents_access" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="OSM data">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_exp="" expanded="0" checked="Qt::Checked" patch_size="0,0" name="osm_roads" legend_split_behavior="0" source="./osm_roads.shp">
+      <layer-tree-layer providerKey="ogr" expanded="0" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="osm_roads" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="osm_places" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="osm_places" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_places [7]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Unchecked" name="Start and Finish pages">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="data-comments" legend_split_behavior="0" source="./data-comments.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="data-comments" source="./data-comments.shp">
         <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" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="start_finish_area" legend_split_behavior="0" source="./start_finish_area.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="start_finish_area" source="./start_finish_area.shp">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -244,35 +244,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="0" checked="Qt::Unchecked" name="Elevation">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Unchecked" patch_size="0,0" name="capetownelevation-1m" legend_split_behavior="0" source="./capetownelevation-1m.shp">
+      <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="capetownelevation-1m" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Map">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_exp="" expanded="0" checked="Qt::Checked" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml">
+      <layer-tree-layer providerKey="gdal" expanded="0" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="Outlines" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137">
+      <layer-tree-layer providerKey="wms" expanded="1" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="Outlines" 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">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="Outlines" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -306,32 +306,32 @@
       <item>route_markers_21122a5c_9be9_458c_9d62_573685055e1c</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" unit="1" enabled="1" intersection-snapping="1" maxScale="0" tolerance="10" type="1" scaleDependencyMode="0" self-snapping="1" minScale="0">
+  <snapping-settings enabled="1" tolerance="10" intersection-snapping="1" unit="1" type="1" self-snapping="1" mode="3" scaleDependencyMode="0" maxScale="0" minScale="0">
     <individual-layer-settings>
-      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="water_tables20170921142016467" units="2" enabled="0" maxScale="0" tolerance="0" type="2" minScale="0"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" enabled="1" maxScale="0" tolerance="20" type="2" minScale="0"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" enabled="0" maxScale="0" tolerance="12" type="1" minScale="0"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="extra_security20170921130834191" units="2" enabled="0" maxScale="0" tolerance="0" type="2" minScale="0"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" enabled="0" maxScale="0" tolerance="12" type="0" minScale="0"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" enabled="0" maxScale="0" tolerance="12" type="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="0" id="water_tables20170921142016467" type="2" maxScale="0" units="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="0" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="0" id="extra_security20170921130834191" type="2" maxScale="0" units="2" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" maxScale="0" units="1" minScale="0"/>
+      <layer-setting enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" maxScale="0" units="1" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -339,10 +339,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40536111431805821</xmin>
-      <ymin>-33.9064593668288623</ymin>
-      <xmax>18.40637769723523931</xmax>
-      <ymax>-33.90592672608071467</ymax>
+      <xmin>18.39622267689280832</xmin>
+      <ymin>-33.90543221999161005</ymin>
+      <xmax>18.41248800356770587</xmax>
+      <ymax>-33.89690996802124801</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -364,165 +364,165 @@
   <projectModels/>
   <legend updateDrawingOrder="true">
     <legendgroup checked="Qt::Checked" open="true" name="Marshals">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="marshal_positions">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="marshal_positions">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="extra_security">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="extra_security20170921130834191" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="extra_security">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" open="true" name="marshals_by_position">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="marshals_by_position20161003112326575" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1" name="marshals_by_position">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="complete_marshal_overview">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="complete_marshal_overview">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="marshal_overviews">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="marshal_overviews">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" open="true" name="Fencing and Cones">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="fencing">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0"/>
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="fencing">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="cone_only_groups">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="cone_only_groups">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="fence_and_cone_groups">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="fence_and_cone_groups">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="Routes">
       <legendgroup checked="Qt::Checked" open="true" name="Markers">
-        <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="route_markers">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" isInOverview="0"/>
+        <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="route_markers">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="all_routes">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="all_routes">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="timelapse">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0"/>
+    <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="timelapse">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
     <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="water_tables">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="water_tables20170921142016467" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="water_tables">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="poi_labels">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="poi_labels">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="directions_to_start">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="directions_to_start">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="mayor">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="mayor">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="viplabels">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="viplabels">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="vipaccess">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="vipaccess">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="false" name="golfaccess">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="false" showFeatureCount="0" name="golfaccess">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access_roads">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="residents_access_roads">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="residents_access">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="residents_access">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="OSM data">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="false" name="osm_roads">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="1" name="osm_roads">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" open="true" name="osm_places">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="1" name="osm_places">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="data-comments">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="data-comments">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" open="true" name="start_finish_area">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="0" name="start_finish_area">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
-      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" open="true" name="capetownelevation-1m">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Unchecked" open="true" showFeatureCount="1" name="capetownelevation-1m">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" open="true" name="Map">
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="false" name="GDAL-City of Cape Town 2015 Aerial">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="false" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" open="true" name="Outlines">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0"/>
+      <legendlayer drawingOrder="-1" checked="Qt::Checked" open="true" showFeatureCount="0" name="Outlines">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" legendPlaceholderImage="" autoRefreshEnabled="0" type="annotation" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -573,7 +573,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="100000" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="raster" maxScale="100000" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -638,7 +638,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -649,9 +649,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"/>
@@ -663,58 +663,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal enabled="0" fetchMode="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" symbology="Line" enabled="0" zscale="1" zoffset="0">
+      <elevation symbology="Line" enabled="0" zscale="1" band="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -745,36 +745,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -789,9 +789,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -800,27 +800,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Value" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" greenBand="2" blueBand="3" opacity="0.5" redBand="1" type="multibandcolor" nodataColor="">
+        <rasterrenderer alphaBand="-1" blueBand="3" nodataColor="" redBand="1" type="multibandcolor" greenBand="2" opacity="0.5">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -831,14 +831,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeBlue="128" colorizeRed="255" grayscaleMode="0" colorizeOn="0" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeStrength="100" grayscaleMode="0" invertColors="0" saturation="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="raster" maxScale="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -903,7 +903,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -914,7 +914,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"/>
@@ -926,58 +926,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal enabled="0" fetchMode="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" symbology="Line" enabled="0" zscale="1" zoffset="0">
+      <elevation symbology="Line" enabled="0" zscale="1" band="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1008,36 +1008,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1052,9 +1052,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1063,27 +1063,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Undefined" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1" opacity="0.75">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1094,14 +1094,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeBlue="128" colorizeRed="255" grayscaleMode="0" colorizeOn="0" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeStrength="100" grayscaleMode="0" invertColors="0" saturation="0" colorizeOn="0" colorizeGreen="128" colorizeBlue="128" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1166,7 +1166,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1180,8 +1180,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_km" expression="$length * 100"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_m" expression="$length * 100 * 1000"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100" name="length_km"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100 * 1000" name="length_m"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1194,58 +1194,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="RouteLen" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="RouteLen" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1276,36 +1276,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1320,44 +1320,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1380,59 +1380,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" checkstate="0" label="Active Routes" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
-            <rule symbol="1" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'"/>
-            <rule symbol="2" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'"/>
-            <rule symbol="3" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'"/>
-            <rule symbol="4" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule description="Only show when active in Atlas" checkstate="0" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes" symbol="0">
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" label="21KM" symbol="1"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" label="10KM" symbol="2"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" label="5KM" symbol="3"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" label="Trail" symbol="4"/>
           </rule>
-          <rule symbol="5" label="Show by day" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )">
-            <rule symbol="6" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'"/>
-            <rule symbol="7" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'"/>
-            <rule symbol="8" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'"/>
-            <rule symbol="9" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'"/>
+          <rule description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" label="Show by day" symbol="5">
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" label="21KM" symbol="6"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" label="10KM" symbol="7"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" label="5KM" symbol="8"/>
+            <rule description="This should be disabled, since it's only for legends" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" label="Trail" symbol="9"/>
           </rule>
-          <rule symbol="10" checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule symbol="11" checkstate="0" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" symbol="10"/>
+          <rule checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Always show by day" symbol="11"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1452,44 +1452,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1505,32 +1505,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@0@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1545,15 +1545,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1561,35 +1561,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1620,36 +1620,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1669,40 +1669,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1725,38 +1725,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1776,40 +1776,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1832,47 +1832,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1892,44 +1892,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1945,32 +1945,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1985,15 +1985,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2001,35 +2001,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2060,36 +2060,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2109,40 +2109,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2165,38 +2165,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2216,40 +2216,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2272,58 +2272,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="10">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2354,56 +2354,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="11">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="11">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.46" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2434,45 +2434,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2492,44 +2492,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2545,32 +2545,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2585,15 +2585,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2601,35 +2601,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2660,36 +2660,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2709,40 +2709,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2765,38 +2765,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2816,40 +2816,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2872,47 +2872,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2932,44 +2932,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2985,32 +2985,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@3@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3025,15 +3025,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3041,35 +3041,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3100,36 +3100,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3149,40 +3149,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3205,38 +3205,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3256,40 +3256,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3312,47 +3312,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3372,44 +3372,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3425,32 +3425,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@4@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@4@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3465,15 +3465,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3481,35 +3481,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3540,36 +3540,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3589,40 +3589,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3645,38 +3645,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3696,40 +3696,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@4@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@4@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3752,47 +3752,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3812,44 +3812,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3865,32 +3865,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@5@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@5@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3905,15 +3905,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3921,35 +3921,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3980,36 +3980,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4029,40 +4029,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4085,38 +4085,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4136,40 +4136,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@5@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@5@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4192,47 +4192,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="6">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="6">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4252,44 +4252,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4305,32 +4305,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@6@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@6@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4345,15 +4345,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4361,35 +4361,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4420,36 +4420,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4469,40 +4469,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4525,38 +4525,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4576,40 +4576,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@6@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@6@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4632,47 +4632,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="7">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="7">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4692,44 +4692,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4745,32 +4745,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@7@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@7@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4785,15 +4785,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4801,35 +4801,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4860,36 +4860,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4909,40 +4909,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4965,38 +4965,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5016,40 +5016,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@7@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@7@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5072,47 +5072,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="8">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="8">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5132,44 +5132,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5185,32 +5185,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@8@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@8@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5225,15 +5225,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5241,35 +5241,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5300,36 +5300,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5349,40 +5349,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5405,38 +5405,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5456,40 +5456,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@8@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@8@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5512,47 +5512,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="9">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="9">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5572,44 +5572,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5625,32 +5625,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@9@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@9@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5665,15 +5665,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5681,35 +5681,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5740,36 +5740,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5789,40 +5789,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@2">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5845,38 +5845,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5896,40 +5896,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@9@3">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@9@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5952,15 +5952,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5969,47 +5969,47 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
           <rule description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="round($length / 1000, 0)" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round($length / 1000, 0)" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="164,113,88,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6032,34 +6032,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6074,98 +6074,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="km_marker()" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="1" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="1" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="km_marker()" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6174,19 +6174,19 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6195,47 +6195,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6266,9 +6266,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6276,16 +6276,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6296,8 +6296,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6306,8 +6306,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6316,8 +6316,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6326,8 +6326,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6336,8 +6336,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6346,8 +6346,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6356,8 +6356,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6366,8 +6366,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6390,8 +6390,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6400,91 +6400,91 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Sort" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Sort" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="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_km" desc="" exp=""/>
-        <constraint field="length_m" desc="" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_km" expression="$length * 100"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="length_m" expression="$length * 100 * 1000"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100" name="length_km"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="$length * 100 * 1000" name="length_m"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
         <columns>
-          <column type="field" width="152" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="163" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="field" width="188" name="length_m" hidden="0"/>
-          <column type="field" width="-1" name="Sort" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="266" name="length_km" hidden="0"/>
+          <column hidden="0" width="152" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="163" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="0" width="188" type="field" name="length_m"/>
+          <column hidden="0" width="-1" type="field" name="Sort"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="266" type="field" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6562,7 +6562,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6635,58 +6635,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6717,36 +6717,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6761,44 +6761,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6821,54 +6821,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="183,72,75,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6899,9 +6899,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6912,15 +6912,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6950,30 +6950,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" index="0" name=""/>
-        <alias field="height" index="1" name=""/>
-        <alias field="elevation" index="2" name=""/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <defaults>
-        <default field="ID" applyOnUpdate="0" expression=""/>
-        <default field="height" applyOnUpdate="0" expression=""/>
-        <default field="elevation" applyOnUpdate="0" expression=""/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="ID" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="height" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="elevation" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="ID" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="height" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="elevation" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" desc="" exp=""/>
-        <constraint field="height" desc="" exp=""/>
-        <constraint field="elevation" desc="" exp=""/>
+        <constraint desc="" field="ID" exp=""/>
+        <constraint desc="" field="height" exp=""/>
+        <constraint desc="" field="elevation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6996,7 +6996,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7071,58 +7071,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7153,36 +7153,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7197,44 +7197,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7257,38 +7257,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7303,9 +7303,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7316,17 +7316,17 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -7363,34 +7363,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="page" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="page" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7413,7 +7413,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7488,58 +7488,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7570,36 +7570,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -7614,44 +7614,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7674,38 +7674,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="38,162,105,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="f_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="38,162,105,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="f_diagonal" 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"/>
@@ -7720,9 +7720,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="f_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7734,9 +7734,9 @@ def my_form_open(dialog, layer, feature):
       <customproperties>
         <Option type="Map">
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="int" name="embeddedWidgets/count"/>
+          <Option type="int" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7745,47 +7745,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="1" lineSizeType="MM" spacing="5" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="1" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="5" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="0" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7816,9 +7816,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7826,22 +7826,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -7885,45 +7885,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="306" name="name" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="306" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7980,7 +7980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -8045,7 +8045,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8070,58 +8070,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8152,36 +8152,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -8196,44 +8196,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8256,54 +8256,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,85,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8334,9 +8334,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8347,32 +8347,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="Name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="Name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -8387,67 +8387,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="LineGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="LineGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -8456,47 +8456,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8527,9 +8527,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8537,16 +8537,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -8569,30 +8569,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Name" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Name" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Name" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8637,7 +8637,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8702,7 +8702,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8727,58 +8727,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8809,36 +8809,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8853,44 +8853,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8913,48 +8913,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="21KM" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
-          <rule symbol="1" label="10KM" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
-          <rule symbol="2" label="5KM" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
+          <rule description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" label="21KM" symbol="0"/>
+          <rule description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" label="10KM" symbol="1"/>
+          <rule description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8974,40 +8974,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="miter" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="area" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -9030,32 +9030,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9075,44 +9075,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@0@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -9128,32 +9128,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@0@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -9168,9 +9168,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9178,35 +9178,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9237,39 +9237,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9289,44 +9289,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -9342,32 +9342,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -9382,9 +9382,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9392,24 +9392,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9429,44 +9429,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -9482,32 +9482,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -9522,9 +9522,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9532,35 +9532,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9591,39 +9591,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9643,44 +9643,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9696,32 +9696,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@0@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9736,9 +9736,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9746,24 +9746,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9783,44 +9783,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9836,32 +9836,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@2@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9876,9 +9876,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9886,35 +9886,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="69,100,25,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9945,25 +9945,25 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9972,47 +9972,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10043,9 +10043,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10053,16 +10053,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10080,38 +10080,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="Distance" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="Distance" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="id" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10174,7 +10174,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -10247,58 +10247,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10329,36 +10329,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -10373,44 +10373,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10433,46 +10433,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="0.796078" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.796078" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="227,0,185,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10495,15 +10495,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10516,32 +10516,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
           <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10556,151 +10556,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="4" isExpression="0" multilineHeight="1" fontItalic="0" textColor="227,0,185,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="4" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="227,0,185,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10715,89 +10715,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10806,145 +10806,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10953,47 +10953,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11024,9 +11024,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11034,16 +11034,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="10" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="10" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11054,8 +11054,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -11064,8 +11064,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -11074,43 +11074,43 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11186,7 +11186,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Polygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11251,7 +11251,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11280,58 +11280,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11362,36 +11362,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -11406,44 +11406,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11466,38 +11466,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,85,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,85,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -11512,9 +11512,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11525,13 +11525,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;name&quot;" type="QString"/>
+            <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -11540,47 +11540,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11611,9 +11611,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11621,22 +11621,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -11687,50 +11687,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
-        <alias field="cone_len" index="4" name=""/>
-        <alias field="fence_len" index="5" name=""/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
+        <alias index="5" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="group" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="415" name="name" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="fence_len" hidden="0"/>
+          <column hidden="0" width="415" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11790,7 +11790,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11855,7 +11855,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11869,47 +11869,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" readOnly="0" simplifyLocal="1" simplifyDrawingHints="1" maxScale="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" minScale="1e+08" simplifyAlgorithm="0" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0">
+          <qgis readOnly="0" simplifyAlgorithm="0" styleCategories="AllStyleCategories" simplifyDrawingHints="1" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyLocal="1" maxScale="0" simplifyDrawingTol="1" labelsEnabled="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" enableorderby="0">
+            <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" force_rhr="0" type="line" name="0">
-                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="255,255,0,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.5"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="ring_filter" v="0"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <symbol type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
+                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="255,255,0,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.5" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="ring_filter"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11920,62 +11920,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontWeight="50" namedStyle="Regular" fontStrikeout="0" fontUnderline="0" textOpacity="0.8" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontCapitals="0" fontSize="11" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" fieldName="comment" blendMode="0" fontLetterSpacing="0" useSubstitutions="0" fontWordSpacing="0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.6" shapeOpacity="0.6" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeType="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeSVGFile=""/>
-                      <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="comment" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" fontWeight="50" blendMode="0" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.8">
+                      <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM"/>
+                      <background shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeRadiiUnit="MM" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="0.6" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRotation="0"/>
+                      <shadow shadowRadius="1.5" shadowOpacity="0.7" shadowUnder="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowScale="100" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" placeDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" formatNumbers="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" priority="5" xOffset="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placement="4" centroidWhole="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" preserveRotation="1" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" distUnits="MM" dist="5" placementFlags="2" maxCurvedCharAngleOut="-25"/>
-                    <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" displayAll="1" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" zIndex="0" scaleMin="0" obstacleFactor="1"/>
+                    <text-format addDirectionSymbol="0" wrapChar="" formatNumbers="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" decimals="3" leftDirectionSymbol="&lt;"/>
+                    <placement maxCurvedCharAngleIn="25" yOffset="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" fitInPolygonOnly="0" repeatDistanceUnits="MM" offsetUnits="MM" preserveRotation="1" dist="5" centroidInside="0" quadOffset="4" repeatDistance="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" centroidWhole="0" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="4" geometryGenerator="" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" limitNumLabels="0" displayAll="1" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontWeight="63" namedStyle="Semibold" fontStrikeout="0" fontUnderline="0" textOpacity="1" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontCapitals="0" fontSize="12" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" blendMode="0" fontLetterSpacing="0" useSubstitutions="0" fontWordSpacing="0" fontSizeUnit="Point">
-                      <text-buffer bufferSizeUnits="MM" bufferJoinStyle="128" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeType="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSVGFile=""/>
-                      <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowOffsetDist="1" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="round( $length, 1) || 'm'" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" fontWeight="63" blendMode="0" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
+                      <text-buffer bufferJoinStyle="128" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM"/>
+                      <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeRadiiUnit="MM" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeRotation="0"/>
+                      <shadow shadowRadius="1.5" shadowOpacity="0.7" shadowUnder="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowScale="100" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" placeDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" formatNumbers="0" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                    <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" priority="5" xOffset="0" centroidInside="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" geometryGenerator="" fitInPolygonOnly="0" placement="2" centroidWhole="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" maxCurvedCharAngleIn="25" repeatDistanceUnits="MM" preserveRotation="1" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" distUnits="MM" dist="1" placementFlags="15" maxCurvedCharAngleOut="-25"/>
-                    <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" displayAll="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" zIndex="0" scaleMin="0" obstacleFactor="1"/>
+                    <text-format addDirectionSymbol="0" wrapChar="" formatNumbers="0" useMaxLineLengthForAutoWrap="1" autoWrapLength="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" multilineAlign="4294967295" placeDirectionSymbol="0" plussign="0" decimals="3" leftDirectionSymbol="&lt;"/>
+                    <placement maxCurvedCharAngleIn="25" yOffset="0" distUnits="MM" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" fitInPolygonOnly="0" repeatDistanceUnits="MM" offsetUnits="MM" preserveRotation="1" dist="1" centroidInside="0" quadOffset="4" repeatDistance="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" centroidWhole="0" xOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" geometryGenerator="" offsetType="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" limitNumLabels="0" displayAll="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11983,8 +11983,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11992,21 +11992,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" lineSizeType="MM" scaleDependency="Area" scaleBasedVisibility="0" height="15" width="15" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" barWidth="5" diagramOrientation="Up" maxScaleDenominator="1e+08" backgroundColor="#ffffff" backgroundAlpha="255" minimumSize="0" minScaleDenominator="0" enabled="0" sizeType="MM">
+              <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" scaleDependency="Area" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
                 <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
                 <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+            <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -12090,81 +12090,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" index="0" name=""/>
-              <alias field="group" index="1" name=""/>
-              <alias field="comment" index="2" name=""/>
-              <alias field="moveable" index="3" name=""/>
-              <alias field="type" index="4" name=""/>
-              <alias field="name" index="5" name=""/>
-              <alias field="hidden" index="6" name=""/>
-              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
-              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
-              <alias field="fence_len" index="9" name=""/>
-              <alias field="cone_len" index="10" name=""/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default field="id" applyOnUpdate="0" expression=""/>
-              <default field="group" applyOnUpdate="0" expression=""/>
-              <default field="comment" applyOnUpdate="0" expression=""/>
-              <default field="moveable" applyOnUpdate="0" expression=""/>
-              <default field="type" applyOnUpdate="0" expression=""/>
-              <default field="name" applyOnUpdate="0" expression=""/>
-              <default field="hidden" applyOnUpdate="0" expression=""/>
-              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
-              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
-              <default field="fence_len" applyOnUpdate="0" expression=""/>
-              <default field="cone_len" applyOnUpdate="0" expression=""/>
+              <default field="id" expression="" applyOnUpdate="0"/>
+              <default field="group" expression="" applyOnUpdate="0"/>
+              <default field="comment" expression="" applyOnUpdate="0"/>
+              <default field="moveable" expression="" applyOnUpdate="0"/>
+              <default field="type" expression="" applyOnUpdate="0"/>
+              <default field="name" expression="" applyOnUpdate="0"/>
+              <default field="hidden" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positiony" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positionx" expression="" applyOnUpdate="0"/>
+              <default field="fence_len" expression="" applyOnUpdate="0"/>
+              <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint field="id" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="group" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="comment" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="moveable" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="type" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="name" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="hidden" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="fence_len" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint field="cone_len" notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="comment" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="moveable" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="hidden" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
+              <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="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 desc="" field="id" exp=""/>
+              <constraint desc="" field="group" exp=""/>
+              <constraint desc="" field="comment" exp=""/>
+              <constraint desc="" field="moveable" exp=""/>
+              <constraint desc="" field="type" exp=""/>
+              <constraint desc="" field="name" exp=""/>
+              <constraint desc="" field="hidden" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
+              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
+              <constraint desc="" field="fence_len" exp=""/>
+              <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)"/>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-              <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+              <field subType="0" precision="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
+            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
               <columns>
-                <column type="field" width="-1" hidden="0" name="id"/>
-                <column type="field" width="-1" hidden="0" name="group"/>
-                <column type="actions" width="-1" hidden="1"/>
-                <column type="field" width="223" hidden="0" name="comment"/>
-                <column type="field" width="-1" hidden="0" name="moveable"/>
-                <column type="field" width="-1" hidden="0" name="type"/>
-                <column type="field" width="414" hidden="0" name="name"/>
-                <column type="field" width="-1" hidden="0" name="hidden"/>
-                <column type="field" width="-1" hidden="0" name="fence_len"/>
-                <column type="field" width="-1" hidden="0" name="cone_len"/>
-                <column type="field" width="-1" hidden="1" name="auxiliary_storage_labeling_positiony"/>
-                <column type="field" width="-1" hidden="1" name="auxiliary_storage_labeling_positionx"/>
+                <column hidden="0" width="-1" type="field" name="id"/>
+                <column hidden="0" width="-1" type="field" name="group"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column hidden="0" width="223" type="field" name="comment"/>
+                <column hidden="0" width="-1" type="field" name="moveable"/>
+                <column hidden="0" width="-1" type="field" name="type"/>
+                <column hidden="0" width="414" type="field" name="name"/>
+                <column hidden="0" width="-1" type="field" name="hidden"/>
+                <column hidden="0" width="-1" type="field" name="fence_len"/>
+                <column hidden="0" width="-1" type="field" name="cone_len"/>
+                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positiony"/>
+                <column hidden="1" width="-1" type="field" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -12237,58 +12237,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12319,36 +12319,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -12363,44 +12363,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -12423,64 +12423,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0" referencescale="-1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Cones" symbol="0"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Moveable fences" symbol="1"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Fixed fences" symbol="2"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Construction" symbol="3"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Is Visible" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="1;4" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="Point" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dot" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -12511,56 +12511,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="4;3" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -12591,56 +12591,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12671,56 +12671,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12751,56 +12751,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12831,50 +12831,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12905,9 +12905,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12918,32 +12918,32 @@ def my_form_open(dialog, layer, feature):
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
           <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="comment" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="comment" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.80000000000000004">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.59999999999999998" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.59999999999999998" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.6" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12958,118 +12958,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="5" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1.8200000000000001" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="5" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13092,34 +13092,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13134,112 +13134,112 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13262,34 +13262,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13304,112 +13304,112 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="11" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="11" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -13432,34 +13432,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -13474,72 +13474,72 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="14" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="6" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="6" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="14" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -13548,13 +13548,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="&quot;id&quot;" type="QString"/>
+            <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13563,47 +13563,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13634,9 +13634,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13644,16 +13644,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13732,74 +13732,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="group" index="1" name=""/>
-        <alias field="comment" index="2" name=""/>
-        <alias field="moveable" index="3" name=""/>
-        <alias field="type" index="4" name=""/>
-        <alias field="name" index="5" name=""/>
-        <alias field="hidden" index="6" name=""/>
-        <alias field="day" index="7" name=""/>
-        <alias field="fence_len" index="8" name=""/>
-        <alias field="cone_len" index="9" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="comment" applyOnUpdate="0" expression=""/>
-        <default field="moveable" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="hidden" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="fence_len" applyOnUpdate="0" expression=""/>
-        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="group" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="comment" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="moveable" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="hidden" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="fence_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="cone_len" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="group" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="comment" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="moveable" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="hidden" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="fence_len" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="cone_len" exp_strength="0" notnull_strength="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="day" desc="" exp=""/>
-        <constraint field="fence_len" desc="" exp=""/>
-        <constraint field="cone_len" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="group" exp=""/>
+        <constraint desc="" field="comment" exp=""/>
+        <constraint desc="" field="moveable" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="hidden" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)"/>
-        <field comment="" precision="0" subType="0" length="-1" typeName="double precision" type="6" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len"/>
+        <field precision="0" subType="0" length="-1" typeName="double precision" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="group" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="373" name="comment" hidden="0"/>
-          <column type="field" width="-1" name="moveable" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="316" name="name" hidden="0"/>
-          <column type="field" width="-1" name="hidden" hidden="0"/>
-          <column type="field" width="-1" name="fence_len" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="group"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="373" type="field" name="comment"/>
+          <column hidden="0" width="-1" type="field" name="moveable"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="316" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="hidden"/>
+          <column hidden="0" width="-1" type="field" name="fence_len"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13877,7 +13877,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13950,58 +13950,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14032,36 +14032,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -14076,44 +14076,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14136,54 +14136,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,178,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14214,9 +14214,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14227,11 +14227,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -14240,47 +14240,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14311,9 +14311,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14321,16 +14321,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14346,25 +14346,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14407,7 +14407,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -14480,58 +14480,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14562,36 +14562,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -14606,44 +14606,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14666,38 +14666,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="26,0,201,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="dot" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -14712,9 +14712,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14725,22 +14725,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -14749,47 +14749,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14820,9 +14820,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14830,22 +14830,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+                <Option type="bool" value="true" name="active"/>
+                <Option type="QString" value="id" name="field"/>
+                <Option type="int" value="2" name="type"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14856,8 +14856,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14866,8 +14866,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14876,8 +14876,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14891,40 +14891,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="page" index="2" name=""/>
-        <alias field="day" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="page" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="page" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="page" desc="" exp=""/>
-        <constraint field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="page" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="page" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14971,7 +14971,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -15036,7 +15036,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15047,7 +15047,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="1" cascadedDelete="0" editable="0" targetFieldName="position" joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1">
+        <join joinFieldName="position" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" targetFieldName="position" editable="0" cascadedDelete="0" memoryCache="1" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -15075,58 +15075,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="id" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="id" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="114,155,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15157,36 +15157,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -15201,44 +15201,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15261,51 +15261,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show by day in marshal plan" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
-          <rule symbol="1" checkstate="0" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="2" checkstate="0" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day in marshal plan" symbol="0"/>
+          <rule checkstate="0" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Always show in marshal plan" symbol="1"/>
+          <rule checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol alpha="0.8" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15328,42 +15328,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.8" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15386,42 +15386,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="0.01" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="0.01" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
+            <layer enabled="1" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15444,9 +15444,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15457,40 +15457,40 @@ def my_form_open(dialog, layer, feature):
         <rules key="{e2cfe0de-49d9-4c26-9f28-7c441fcd9406}">
           <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{6554fdac-c88c-4a54-906c-4410d068210b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -15513,34 +15513,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15555,118 +15555,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{a4dd1032-0030-4a6b-9402-5837f38a97d7}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.10000000000000001" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.10000000000000001" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -15689,34 +15689,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15731,110 +15731,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="1" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="2" obstacleFactor="1" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="1" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{9c1b3f4f-60f7-4728-a973-105f4a2bf2a9}" filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.5" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.5">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.5" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.5" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -15849,189 +15849,189 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{0a116ab9-23e3-44ab-a89c-47d8c9d3bbc7}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="6" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="6" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.59999999999999998">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -16054,34 +16054,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -16096,148 +16096,148 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="8" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="8" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{5fea8fd6-270f-470f-9388-15325712ca1d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="position" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="position" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,0,255" shapeOffsetY="0" shapeBorderWidth="0.40000000000000002" shapeOpacity="0.90000000000000002" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="3" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeType="3" shapeSizeY="0.20000000000000001" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.40000000000000002" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeFillColor="255,255,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="133,182,111,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="133,182,111,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -16260,34 +16260,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -16302,108 +16302,108 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="10" obstacleFactor="1.8" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="0" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="10"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -16412,148 +16412,152 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -16562,47 +16566,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16633,9 +16637,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16643,16 +16647,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16663,8 +16667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16673,8 +16677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16683,8 +16687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16693,8 +16697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16703,8 +16707,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16734,8 +16738,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16784,95 +16788,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="type" index="2" name=""/>
-        <alias field="notes" index="3" name=""/>
-        <alias field="xyposition" index="4" name=""/>
-        <alias field="day" index="5" name=""/>
-        <alias field="csv_day" index="6" name=""/>
-        <alias field="csv_position" index="7" name=""/>
-        <alias field="csv_club" index="8" name=""/>
-        <alias field="csv_captain" index="9" name=""/>
-        <alias field="csv_captain_phone" index="10" name=""/>
-        <alias field="csv_race" index="11" name=""/>
-        <alias field="csv_first_runner" index="12" name=""/>
-        <alias field="csv_last_runner" index="13" name=""/>
-        <alias field="csv_instructions" index="14" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="xyposition" name=""/>
+        <alias index="5" field="day" name=""/>
+        <alias index="6" field="csv_day" name=""/>
+        <alias index="7" field="csv_position" name=""/>
+        <alias index="8" field="csv_club" name=""/>
+        <alias index="9" field="csv_captain" name=""/>
+        <alias index="10" field="csv_captain_phone" name=""/>
+        <alias index="11" field="csv_race" name=""/>
+        <alias index="12" field="csv_first_runner" name=""/>
+        <alias index="13" field="csv_last_runner" name=""/>
+        <alias index="14" field="csv_instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="notes" applyOnUpdate="0" expression=""/>
-        <default field="xyposition" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="csv_day" applyOnUpdate="0" expression=""/>
-        <default field="csv_position" applyOnUpdate="0" expression=""/>
-        <default field="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="csv_race" applyOnUpdate="0" expression=""/>
-        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
-        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="csv_day" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_race" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="notes" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="xyposition" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_club" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_captain" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_captain_phone" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_race" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_first_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_last_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="csv_instructions" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="notes" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="xyposition" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_club" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_captain" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_captain_phone" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_race" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_first_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_last_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="csv_instructions" exp_strength="0" notnull_strength="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_day" desc="" exp=""/>
-        <constraint field="csv_position" desc="" exp=""/>
-        <constraint field="csv_club" desc="" exp=""/>
-        <constraint field="csv_captain" desc="" exp=""/>
-        <constraint field="csv_captain_phone" desc="" exp=""/>
-        <constraint field="csv_race" desc="" exp=""/>
-        <constraint field="csv_first_runner" desc="" exp=""/>
-        <constraint field="csv_last_runner" desc="" exp=""/>
-        <constraint field="csv_instructions" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="notes" exp=""/>
+        <constraint desc="" field="xyposition" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="csv_day" exp=""/>
+        <constraint desc="" field="csv_position" exp=""/>
+        <constraint desc="" field="csv_club" exp=""/>
+        <constraint desc="" field="csv_captain" exp=""/>
+        <constraint desc="" field="csv_captain_phone" exp=""/>
+        <constraint desc="" field="csv_race" exp=""/>
+        <constraint desc="" field="csv_first_runner" exp=""/>
+        <constraint desc="" field="csv_last_runner" exp=""/>
+        <constraint desc="" field="csv_instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="notes" hidden="0"/>
-          <column type="field" width="-1" name="xyposition" hidden="0"/>
-          <column type="field" width="-1" name="csv_day" hidden="0"/>
-          <column type="field" width="-1" name="csv_position" hidden="0"/>
-          <column type="field" width="-1" name="csv_club" hidden="0"/>
-          <column type="field" width="-1" name="csv_captain" hidden="0"/>
-          <column type="field" width="-1" name="csv_captain_phone" hidden="0"/>
-          <column type="field" width="-1" name="csv_race" hidden="0"/>
-          <column type="field" width="-1" name="csv_first_runner" hidden="0"/>
-          <column type="field" width="-1" name="csv_last_runner" hidden="0"/>
-          <column type="field" width="-1" name="csv_instructions" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="notes"/>
+          <column hidden="0" width="151" type="field" name="xyposition"/>
+          <column hidden="0" width="-1" type="field" name="csv_day"/>
+          <column hidden="0" width="-1" type="field" name="csv_position"/>
+          <column hidden="0" width="-1" type="field" name="csv_club"/>
+          <column hidden="0" width="-1" type="field" name="csv_captain"/>
+          <column hidden="0" width="-1" type="field" name="csv_captain_phone"/>
+          <column hidden="0" width="-1" type="field" name="csv_race"/>
+          <column hidden="0" width="-1" type="field" name="csv_first_runner"/>
+          <column hidden="0" width="-1" type="field" name="csv_last_runner"/>
+          <column hidden="0" width="-1" type="field" name="csv_instructions"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17079,7 +17083,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer wkbType="NoGeometry" refreshOnNotifyEnabled="0" autoRefreshTime="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" maxScale="100000" geometry="No geometry" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="vector" minScale="1e+08" hasScaleBasedVisibilityFlag="0">
+    <maplayer refreshOnNotifyEnabled="0" autoRefreshTime="0" readOnly="0" wkbType="NoGeometry" styleCategories="AllStyleCategories" legendPlaceholderImage="" autoRefreshEnabled="0" type="vector" geometry="No geometry" maxScale="100000" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -17132,7 +17136,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17157,58 +17161,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17239,36 +17243,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -17283,44 +17287,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17343,9 +17347,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17354,16 +17358,16 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="first_name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17381,8 +17385,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17391,8 +17395,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17401,8 +17405,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17451,75 +17455,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="day" index="0" name=""/>
-        <alias field="position" index="1" name=""/>
-        <alias field="club" index="2" name=""/>
-        <alias field="captain" index="3" name=""/>
-        <alias field="captain_phone" index="4" name=""/>
-        <alias field="race" index="5" name=""/>
-        <alias field="first_runner" index="6" name=""/>
-        <alias field="last_runner" index="7" name=""/>
-        <alias field="distance" index="8" name=""/>
-        <alias field="instructions" index="9" name=""/>
+        <alias index="0" field="day" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="club" name=""/>
+        <alias index="3" field="captain" name=""/>
+        <alias index="4" field="captain_phone" name=""/>
+        <alias index="5" field="race" name=""/>
+        <alias index="6" field="first_runner" name=""/>
+        <alias index="7" field="last_runner" name=""/>
+        <alias index="8" field="distance" name=""/>
+        <alias index="9" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="captain" applyOnUpdate="0" expression=""/>
-        <default field="captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="race" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="race" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="position" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="club" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="captain" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="captain_phone" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="race" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="first_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="last_runner" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="instructions" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="position" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="club" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="captain" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="captain_phone" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="race" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="first_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="last_runner" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="instructions" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="day" desc="" exp=""/>
-        <constraint field="position" desc="" exp=""/>
-        <constraint field="club" desc="" exp=""/>
-        <constraint field="captain" desc="" exp=""/>
-        <constraint field="captain_phone" desc="" exp=""/>
-        <constraint field="race" desc="" exp=""/>
-        <constraint field="first_runner" desc="" exp=""/>
-        <constraint field="last_runner" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
-        <constraint field="instructions" desc="" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="position" exp=""/>
+        <constraint desc="" field="club" exp=""/>
+        <constraint desc="" field="captain" exp=""/>
+        <constraint desc="" field="captain_phone" exp=""/>
+        <constraint desc="" field="race" exp=""/>
+        <constraint desc="" field="first_runner" exp=""/>
+        <constraint desc="" field="last_runner" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="instructions" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="position" hidden="0"/>
-          <column type="field" width="221" name="name" hidden="0"/>
-          <column type="field" width="-1" name="club" hidden="0"/>
-          <column type="field" width="-1" name="phone" hidden="0"/>
-          <column type="field" width="-1" name="email" hidden="0"/>
-          <column type="field" width="-1" name="captain" hidden="0"/>
-          <column type="field" width="-1" name="races" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="first_runner" hidden="0"/>
-          <column type="field" width="-1" name="last_runner" hidden="0"/>
-          <column type="field" width="-1" name="instructions" hidden="0"/>
-          <column type="field" width="-1" name="firstname" hidden="0"/>
-          <column type="field" width="-1" name="surname" hidden="0"/>
-          <column type="field" width="-1" name="captain_phone" hidden="0"/>
-          <column type="field" width="-1" name="days" hidden="0"/>
-          <column type="field" width="-1" name="captain_email" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="position"/>
+          <column hidden="0" width="221" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="club"/>
+          <column hidden="0" width="-1" type="field" name="phone"/>
+          <column hidden="0" width="-1" type="field" name="email"/>
+          <column hidden="0" width="-1" type="field" name="captain"/>
+          <column hidden="0" width="-1" type="field" name="races"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="first_runner"/>
+          <column hidden="0" width="-1" type="field" name="last_runner"/>
+          <column hidden="0" width="-1" type="field" name="instructions"/>
+          <column hidden="0" width="-1" type="field" name="firstname"/>
+          <column hidden="0" width="-1" type="field" name="surname"/>
+          <column hidden="0" width="-1" type="field" name="captain_phone"/>
+          <column hidden="0" width="-1" type="field" name="days"/>
+          <column hidden="0" width="-1" type="field" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17620,7 +17624,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -17685,7 +17689,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17710,58 +17714,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="141,90,153,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17792,36 +17796,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -17836,44 +17840,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17896,58 +17900,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17978,50 +17982,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -18052,30 +18056,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18095,33 +18099,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -18137,32 +18141,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -18177,9 +18181,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -18192,11 +18196,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18205,47 +18209,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18276,9 +18280,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18286,16 +18290,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18318,30 +18322,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18386,7 +18390,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -18451,7 +18455,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18476,58 +18480,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="232,113,141,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18558,36 +18562,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -18602,44 +18606,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18662,44 +18666,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.75" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8.5" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8.5" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.75">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1.5" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1.5" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18714,109 +18718,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_x" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_y" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="1" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="PreventOverlap" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="0.20000000000000001" scaleMin="1"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="1" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="2" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18825,47 +18829,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18896,9 +18900,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18906,16 +18910,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18926,8 +18930,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18936,8 +18940,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18946,8 +18950,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18956,8 +18960,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18966,8 +18970,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18976,8 +18980,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18986,8 +18990,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18996,8 +19000,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19006,73 +19010,73 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="osm_id" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="type" index="3" name=""/>
-        <alias field="z_order" index="4" name=""/>
-        <alias field="population" index="5" name=""/>
-        <alias field="label_x" index="6" name=""/>
-        <alias field="label_y" index="7" name=""/>
-        <alias field="label_rota" index="8" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="osm_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="z_order" applyOnUpdate="0" expression=""/>
-        <default field="population" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="osm_id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="z_order" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="population" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_x" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_y" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="osm_id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="z_order" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="population" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_x" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_y" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_rota" exp_strength="0" notnull_strength="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 desc="" field="id" exp=""/>
+        <constraint desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="population" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="osm_id" hidden="0"/>
-          <column type="field" width="-1" name="name" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="field" width="-1" name="z_order" hidden="0"/>
-          <column type="field" width="-1" name="population" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="label_x" hidden="0"/>
-          <column type="field" width="-1" name="label_y" hidden="0"/>
-          <column type="field" width="-1" name="label_rota" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="osm_id"/>
+          <column hidden="0" width="-1" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="0" width="-1" type="field" name="z_order"/>
+          <column hidden="0" width="-1" type="field" name="population"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="label_x"/>
+          <column hidden="0" width="-1" type="field" name="label_y"/>
+          <column hidden="0" width="-1" type="field" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19131,7 +19135,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -19196,7 +19200,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19221,58 +19225,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,158,23,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19303,36 +19307,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -19347,44 +19351,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19407,52 +19411,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="7" isExpression="1" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="7" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.80000000000000004">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="196,60,57,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -19475,34 +19479,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19517,118 +19521,118 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="4" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MapUnit" priority="3" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-20" overlapHandling="PreventOverlap" placement="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="1" fontMaxPixelSize="10000" minFeatureSize="5" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="0.29999999999999999" scaleMin="1"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="3" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" placementFlags="4" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="1" obstacle="1" scaleMin="1" minFeatureSize="5" scaleMax="10000000" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="always_sho" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="&quot;&quot;" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -19637,47 +19641,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -19708,9 +19712,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19718,16 +19722,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19738,8 +19742,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19748,8 +19752,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19793,8 +19797,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -19857,100 +19861,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" index="0" name=""/>
-        <alias field="name" index="1" name=""/>
-        <alias field="highway" index="2" name=""/>
-        <alias field="waterway" index="3" name=""/>
-        <alias field="aerialway" index="4" name=""/>
-        <alias field="barrier" index="5" name=""/>
-        <alias field="man_made" index="6" name=""/>
-        <alias field="z_order" index="7" name=""/>
-        <alias field="other_tags" index="8" name=""/>
-        <alias field="never_show" index="9" name=""/>
-        <alias field="label_x" index="10" name=""/>
-        <alias field="label_y" index="11" name=""/>
-        <alias field="label_rota" index="12" name=""/>
-        <alias field="always_sho" index="13" name=""/>
-        <alias field="resident_a" index="14" name=""/>
-        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <defaults>
-        <default field="osm_id" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="highway" applyOnUpdate="0" expression=""/>
-        <default field="waterway" applyOnUpdate="0" expression=""/>
-        <default field="aerialway" applyOnUpdate="0" expression=""/>
-        <default field="barrier" applyOnUpdate="0" expression=""/>
-        <default field="man_made" applyOnUpdate="0" expression=""/>
-        <default field="z_order" applyOnUpdate="0" expression=""/>
-        <default field="other_tags" applyOnUpdate="0" expression=""/>
-        <default field="never_show" applyOnUpdate="0" expression=""/>
-        <default field="label_x" applyOnUpdate="0" expression=""/>
-        <default field="label_y" applyOnUpdate="0" expression=""/>
-        <default field="label_rota" applyOnUpdate="0" expression=""/>
-        <default field="always_sho" applyOnUpdate="0" expression=""/>
-        <default field="resident_a" applyOnUpdate="0" expression=""/>
-        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
+        <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="osm_id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="highway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="waterway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="aerialway" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="barrier" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="man_made" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="z_order" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="other_tags" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="never_show" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_x" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_y" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label_rota" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="always_sho" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="resident_a" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="osm_id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="highway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="waterway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="aerialway" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="barrier" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="man_made" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="z_order" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="other_tags" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="never_show" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_x" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_y" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label_rota" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="always_sho" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="resident_a" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" notnull_strength="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 desc="" field="osm_id" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="highway" exp=""/>
+        <constraint desc="" field="waterway" exp=""/>
+        <constraint desc="" field="aerialway" exp=""/>
+        <constraint desc="" field="barrier" exp=""/>
+        <constraint desc="" field="man_made" exp=""/>
+        <constraint desc="" field="z_order" exp=""/>
+        <constraint desc="" field="other_tags" exp=""/>
+        <constraint desc="" field="never_show" exp=""/>
+        <constraint desc="" field="label_x" exp=""/>
+        <constraint desc="" field="label_y" exp=""/>
+        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" field="always_sho" exp=""/>
+        <constraint desc="" field="resident_a" exp=""/>
+        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="osm_id" hidden="0"/>
-          <column type="field" width="160" name="name" hidden="0"/>
-          <column type="field" width="-1" name="z_order" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="highway" hidden="0"/>
-          <column type="field" width="-1" name="waterway" hidden="0"/>
-          <column type="field" width="-1" name="aerialway" hidden="0"/>
-          <column type="field" width="-1" name="barrier" hidden="0"/>
-          <column type="field" width="-1" name="man_made" hidden="0"/>
-          <column type="field" width="142" name="other_tags" hidden="0"/>
-          <column type="field" width="-1" name="never_show" hidden="0"/>
-          <column type="field" width="-1" name="label_x" hidden="0"/>
-          <column type="field" width="-1" name="label_y" hidden="0"/>
-          <column type="field" width="-1" name="label_rota" hidden="0"/>
-          <column type="field" width="-1" name="always_sho" hidden="0"/>
-          <column type="field" width="-1" name="resident_a" hidden="0"/>
-          <column type="field" width="-1" name="auxiliary_storage_labeling_show" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="osm_id"/>
+          <column hidden="0" width="160" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="z_order"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="highway"/>
+          <column hidden="0" width="-1" type="field" name="waterway"/>
+          <column hidden="0" width="-1" type="field" name="aerialway"/>
+          <column hidden="0" width="-1" type="field" name="barrier"/>
+          <column hidden="0" width="-1" type="field" name="man_made"/>
+          <column hidden="0" width="142" type="field" name="other_tags"/>
+          <column hidden="0" width="-1" type="field" name="never_show"/>
+          <column hidden="0" width="-1" type="field" name="label_x"/>
+          <column hidden="0" width="-1" type="field" name="label_y"/>
+          <column hidden="0" width="-1" type="field" name="label_rota"/>
+          <column hidden="0" width="-1" type="field" name="always_sho"/>
+          <column hidden="0" width="-1" type="field" name="resident_a"/>
+          <column hidden="0" width="-1" type="field" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20119,7 +20123,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -20184,7 +20188,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20209,58 +20213,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="231,113,72,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20291,36 +20295,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -20335,44 +20339,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20395,54 +20399,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
-          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
-          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
-          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
-          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
-          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="star" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.5" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20465,47 +20469,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,32,80,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -20527,47 +20531,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -20589,57 +20593,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/road_closure.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -20661,47 +20665,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,12,254,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="255,255,255,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -20724,18 +20728,18 @@ def my_form_open(dialog, layer, feature):
               <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -20752,24 +20756,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -20792,10 +20796,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -20804,18 +20808,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -20832,24 +20836,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -20873,47 +20877,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="5">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="43,153,41,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -20935,15 +20939,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20952,32 +20956,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="name" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="name" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="2" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="0.69999999999999996" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="2" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="2" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="2" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="1" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="2" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -20992,99 +20996,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="2" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="3" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="3" maxCurvedCharAngleOut="-25" overlapHandling="AllowOverlapIfRequired" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="2" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="2" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="10" obstacleFactor="1.8" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="2" preserveRotation="1" yOffset="3" xOffset="2" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="3" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1.8" fontMaxPixelSize="10000" zIndex="10"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="2" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21093,47 +21097,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21164,9 +21168,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21174,16 +21178,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21220,40 +21224,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="name" index="2" name=""/>
-        <alias field="distance" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="name" desc="" exp=""/>
-        <constraint field="distance" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="name" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="name" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="name"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21302,7 +21306,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -21375,58 +21379,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21457,36 +21461,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -21501,44 +21505,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21561,42 +21565,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="135" name="angle"/>
+                <Option type="QString" value="during_render" name="clip_mode"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="feature" name="coordinate_reference"/>
+                <Option type="QString" value="2" name="distance"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
+                <Option type="QString" value="MM" name="distance_unit"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -21615,48 +21619,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="@0@0">
+              <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option type="QString" value="0" name="align_dash_pattern"/>
+                    <Option type="QString" value="square" name="capstyle"/>
+                    <Option type="QString" value="5;2" name="customdash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="customdash_unit"/>
+                    <Option type="QString" value="0" name="dash_pattern_offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                    <Option type="QString" value="0" name="draw_inside_polygon"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="211,134,33,255" name="line_color"/>
+                    <Option type="QString" value="solid" name="line_style"/>
+                    <Option type="QString" value="0.3" name="line_width"/>
+                    <Option type="QString" value="MM" name="line_width_unit"/>
+                    <Option type="QString" value="0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0" name="ring_filter"/>
+                    <Option type="QString" value="0" name="trim_distance_end"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                    <Option type="QString" value="0" name="trim_distance_start"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                    <Option type="QString" value="0" name="use_custom_dash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -21687,27 +21691,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.46" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="no" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -21722,9 +21726,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21735,11 +21739,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21748,47 +21752,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21819,9 +21823,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21829,16 +21833,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="1" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="1" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21854,26 +21858,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" index="0" name=""/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="FID" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="FID" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" desc="" exp=""/>
+        <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="431" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="431" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21918,7 +21922,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21983,7 +21987,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22008,58 +22012,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,207,80,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22090,36 +22094,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -22134,44 +22138,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22194,61 +22198,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
-          <rule symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
-          <rule symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
-          <rule symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
-          <rule symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open" symbol="0"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking" symbol="1"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" symbol="2"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way" symbol="3"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22279,50 +22283,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="2" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22342,40 +22346,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@0">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="1" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22398,52 +22402,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="2">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="2;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash dot dot" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22474,41 +22478,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22528,46 +22532,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@2@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22590,58 +22594,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="3">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="3;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22672,41 +22676,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -22726,46 +22730,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@3@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -22788,58 +22792,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="4">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22870,20 +22874,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22892,32 +22896,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="50" legendString="Aa" namedStyle="Regular" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="9" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="times" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="times" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="9" fontKerning="1" fontWeight="50" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Regular" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -22932,67 +22936,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="4294967295" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="4294967295" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23001,47 +23005,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23072,9 +23076,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23082,16 +23086,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23128,40 +23132,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
-        <alias field="status" index="2" name=""/>
-        <alias field="times" index="3" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="status" applyOnUpdate="0" expression=""/>
-        <default field="times" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="status" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="times" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="status" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="times" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
-        <constraint field="status" desc="" exp=""/>
-        <constraint field="times" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" field="status" exp=""/>
+        <constraint desc="" field="times" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="202" name="type" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="status" hidden="0"/>
-          <column type="field" width="-1" name="times" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="202" type="field" name="type"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="status"/>
+          <column hidden="0" width="-1" type="field" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23210,7 +23214,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="100000" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="100000" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37569038998762494</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -23283,58 +23287,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23365,36 +23369,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -23409,44 +23413,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23469,54 +23473,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
           <rule description="Active routes" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -23539,34 +23543,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -23581,138 +23585,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
           <rule description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="0,0,0,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="0,0,0,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -23735,34 +23739,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -23777,98 +23781,98 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+              <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -23876,32 +23880,32 @@ def my_form_open(dialog, layer, feature):
           <rule description="List for legends" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0">
             <rule description="21KM" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" filter="&quot;Source&quot; = '21KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="210,32,39,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="210,32,39,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="210,32,39,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -23916,130 +23920,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="3" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="3" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="10KM" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" filter="&quot;Source&quot; = '10KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="103,34,144,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="103,34,144,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="103,34,144,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -24054,130 +24058,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="5KM" key="{693188a6-ae99-4fd2-859f-1606793dda66}" filter="&quot;Source&quot; = '5KM'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeFillColor="145,211,55,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="128" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="145,211,55,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -24192,138 +24196,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
             <rule description="Trail" key="{ba58e108-c24a-410e-9584-a7819af049ef}" filter="&quot;Source&quot; = 'Trail'" active="0">
               <settings calloutType="simple">
-                <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" isExpression="1" multilineHeight="1" fontItalic="0" textColor="255,255,255,255" blendMode="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="1" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="255,255,255,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
                   <families/>
-                  <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                  <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="145,211,55,255" shapeOffsetY="0" shapeBorderWidth="1" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRadiiX="1" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSVGFile="">
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                  <text-buffer bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+                  <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                  <background shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="1" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="1" shapeOffsetY="0" shapeRadiiY="1" shapeOpacity="1" shapeFillColor="145,211,55,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                    <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option type="QString" value="0" name="angle"/>
+                          <Option type="QString" value="square" name="cap_style"/>
+                          <Option type="QString" value="133,182,111,255" name="color"/>
+                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                          <Option type="QString" value="bevel" name="joinstyle"/>
+                          <Option type="QString" value="circle" name="name"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="0" name="outline_width"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="diameter" name="scale_method"/>
+                          <Option type="QString" value="2" name="size"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="size_unit"/>
+                          <Option type="QString" value="1" name="vertical_anchor_point"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -24346,34 +24350,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                    <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="0,72,255,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -24388,77 +24392,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                  <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format placeDirectionSymbol="0" decimals="0" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleIn="20" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="10" preserveRotation="1" dist="2" maxCurvedCharAngleOut="-20" overlapHandling="AllowOverlapIfRequired" placement="6" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="1" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-                <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="2" scaleMin="1"/>
+                <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="0"/>
+                <placement overlapHandling="AllowOverlapIfRequired" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PointGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="1" geometryGenerator="" priority="10" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="2" rotationUnit="AngleDegrees"/>
+                <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="2" fontMaxPixelSize="10000" zIndex="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -24468,13 +24472,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -24483,47 +24487,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="100000" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="100000" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24554,9 +24558,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24564,16 +24568,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -24584,8 +24588,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24594,8 +24598,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24604,8 +24608,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24614,8 +24618,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24624,8 +24628,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24634,8 +24638,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24644,8 +24648,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24654,8 +24658,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24678,8 +24682,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24688,8 +24692,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24698,8 +24702,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24708,8 +24712,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24723,95 +24727,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="Distance" index="5" name=""/>
-        <alias field="RouteLen" index="6" name=""/>
-        <alias field="Source" index="7" name=""/>
-        <alias field="Sort" index="8" name=""/>
-        <alias field="day" index="9" name=""/>
-        <alias field="length_km" index="10" name=""/>
-        <alias field="length_m" index="11" name=""/>
-        <alias field="org_fid" index="12" name=""/>
-        <alias field="distance" index="13" name=""/>
-        <alias field="quadrant" index="14" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
+        <alias index="12" field="org_fid" name=""/>
+        <alias index="13" field="distance" name=""/>
+        <alias index="14" field="quadrant" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="Distance" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="Sort" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
-        <default field="org_fid" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="quadrant" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Sort" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="quadrant" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Sort" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="org_fid" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="quadrant" exp_strength="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_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 desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="quadrant" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="org_fid" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="-1" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="Distance" hidden="0"/>
-          <column type="field" width="-1" name="length_km" hidden="0"/>
-          <column type="field" width="-1" name="Sort" hidden="0"/>
-          <column type="field" width="-1" name="quadrant" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="-1" name="length_m" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="org_fid"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="-1" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="Distance"/>
+          <column hidden="0" width="-1" type="field" name="length_km"/>
+          <column hidden="0" width="-1" type="field" name="Sort"/>
+          <column hidden="0" width="-1" type="field" name="quadrant"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="-1" type="field" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24898,7 +24902,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24971,58 +24975,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25053,36 +25057,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -25097,44 +25101,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25157,38 +25161,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="singleSymbol" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -25203,9 +25207,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25216,18 +25220,18 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
@@ -25257,35 +25261,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="area" index="1" name=""/>
-        <alias field="rotation" index="2" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="area" applyOnUpdate="0" expression=""/>
-        <default field="rotation" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="area" expression="" applyOnUpdate="0"/>
+        <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="area" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="rotation" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="area" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="rotation" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="area" desc="" exp=""/>
-        <constraint field="rotation" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="area" exp=""/>
+        <constraint desc="" field="rotation" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="area" hidden="0"/>
-          <column type="field" width="-1" name="rotation" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="area"/>
+          <column hidden="0" width="-1" type="field" name="rotation"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25308,7 +25312,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25373,7 +25377,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25398,58 +25402,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25480,36 +25484,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -25524,44 +25528,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25584,49 +25588,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="1" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25649,20 +25653,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25674,15 +25678,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -25691,47 +25695,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25762,9 +25766,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25772,16 +25776,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25813,8 +25817,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25830,8 +25834,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25840,8 +25844,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -25890,85 +25894,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" index="0" name=""/>
-        <alias field="descriptio" index="1" name=""/>
-        <alias field="timestamp" index="2" name=""/>
-        <alias field="begin" index="3" name=""/>
-        <alias field="end" index="4" name=""/>
-        <alias field="RouteLen" index="5" name=""/>
-        <alias field="Source" index="6" name=""/>
-        <alias field="length_m" index="7" name=""/>
-        <alias field="length_km" index="8" name=""/>
-        <alias field="org_fid" index="9" name=""/>
-        <alias field="distance" index="10" name=""/>
-        <alias field="first_runn" index="11" name=""/>
-        <alias field="last_runne" index="12" name=""/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <defaults>
-        <default field="Name" applyOnUpdate="0" expression=""/>
-        <default field="descriptio" applyOnUpdate="0" expression=""/>
-        <default field="timestamp" applyOnUpdate="0" expression=""/>
-        <default field="begin" applyOnUpdate="0" expression=""/>
-        <default field="end" applyOnUpdate="0" expression=""/>
-        <default field="RouteLen" applyOnUpdate="0" expression=""/>
-        <default field="Source" applyOnUpdate="0" expression=""/>
-        <default field="length_m" applyOnUpdate="0" expression=""/>
-        <default field="length_km" applyOnUpdate="0" expression=""/>
-        <default field="org_fid" applyOnUpdate="0" expression=""/>
-        <default field="distance" applyOnUpdate="0" expression=""/>
-        <default field="first_runn" applyOnUpdate="0" expression=""/>
-        <default field="last_runne" applyOnUpdate="0" expression=""/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="first_runn" expression="" applyOnUpdate="0"/>
+        <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="Name" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="descriptio" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="timestamp" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="begin" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="end" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="Source" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_m" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="length_km" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="org_fid" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="distance" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="first_runn" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="last_runne" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Name" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="descriptio" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="timestamp" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="begin" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="end" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="RouteLen" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="Source" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_m" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="length_km" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="org_fid" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="distance" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="first_runn" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="last_runne" exp_strength="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="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 desc="" field="Name" exp=""/>
+        <constraint desc="" field="descriptio" exp=""/>
+        <constraint desc="" field="timestamp" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" field="first_runn" exp=""/>
+        <constraint desc="" field="last_runne" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="179" name="begin" hidden="0"/>
-          <column type="field" width="-1" name="RouteLen" hidden="0"/>
-          <column type="field" width="-1" name="Source" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="Name" hidden="0"/>
-          <column type="field" width="-1" name="length_m" hidden="0"/>
-          <column type="field" width="-1" name="length_km" hidden="0"/>
-          <column type="field" width="-1" name="org_fid" hidden="0"/>
-          <column type="field" width="-1" name="first_runn" hidden="0"/>
-          <column type="field" width="-1" name="last_runne" hidden="0"/>
-          <column type="field" width="-1" name="descriptio" hidden="0"/>
-          <column type="field" width="-1" name="timestamp" hidden="0"/>
-          <column type="field" width="-1" name="end" hidden="0"/>
-          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column hidden="0" width="179" type="field" name="begin"/>
+          <column hidden="0" width="-1" type="field" name="RouteLen"/>
+          <column hidden="0" width="-1" type="field" name="Source"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="Name"/>
+          <column hidden="0" width="-1" type="field" name="length_m"/>
+          <column hidden="0" width="-1" type="field" name="length_km"/>
+          <column hidden="0" width="-1" type="field" name="org_fid"/>
+          <column hidden="0" width="-1" type="field" name="first_runn"/>
+          <column hidden="0" width="-1" type="field" name="last_runne"/>
+          <column hidden="0" width="-1" type="field" name="descriptio"/>
+          <column hidden="0" width="-1" type="field" name="timestamp"/>
+          <column hidden="0" width="-1" type="field" name="end"/>
+          <column hidden="0" width="-1" type="field" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26059,7 +26063,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiLineString" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="0" styleCategories="AllStyleCategories" readOnly="0" geometry="Line" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26132,58 +26136,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26214,36 +26218,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -26258,44 +26262,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26318,58 +26322,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="RuleRenderer" referencescale="-1" enableorderby="0">
+      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
-          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="0">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26400,50 +26404,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="1">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -26474,30 +26478,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="MarkerLine">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -26517,33 +26521,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="@1@1">
+              <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -26559,32 +26563,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="@@1@1@0">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -26599,9 +26603,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -26614,11 +26618,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26627,47 +26631,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26698,9 +26702,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26708,16 +26712,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="2" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="2" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26740,30 +26744,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="type" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="type" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="type" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="type" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="type" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="type" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26808,7 +26812,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="Point" simplifyMaxScale="1" simplifyDrawingHints="0" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Point" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="0" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26881,58 +26885,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26963,36 +26967,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -27007,44 +27011,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27067,44 +27071,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontKerning="1" fontWeight="63" legendString="Aa" namedStyle="Semibold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="15" isExpression="0" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fieldName="label" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+          <text-style fieldName="label" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="15" fontKerning="1" fontWeight="63" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Semibold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="1" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27119,66 +27123,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" xOffset="0" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="4" geometryGeneratorType="PointGeometry"/>
-          <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="0" obstacleType="0" maxNumLabels="2000" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="0" obstacleFactor="1" scaleMin="0"/>
+          <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="3" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+          <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="UnknownGeometry" quadOffset="4" preserveRotation="1" yOffset="0" xOffset="0" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="0" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+          <rendering maxNumLabels="2000" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="0" minFeatureSize="0" scaleMax="0" obstacleFactor="1" fontMaxPixelSize="10000" zIndex="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27187,47 +27191,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" style="0" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" italic="1" bold="0" style="0"/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27258,9 +27262,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27268,16 +27272,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="18" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="18" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -27300,30 +27304,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="label" index="1" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" desc="" exp=""/>
-        <constraint field="label" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="label" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="field" width="-1" name="label" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="0" width="-1" type="field" name="label"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27368,7 +27372,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" wkbType="MultiPolygon" simplifyMaxScale="1" simplifyDrawingHints="1" type="vector" maxScale="0" legendPlaceholderImage="" simplifyLocal="1" minScale="100000000" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" labelsEnabled="1" styleCategories="AllStyleCategories" readOnly="0" geometry="Polygon" simplifyAlgorithm="0">
+    <maplayer simplifyDrawingHints="1" maxScale="0" readOnly="0" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" labelsEnabled="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyMaxScale="1" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -27433,7 +27437,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxx="0" maxz="0" dimensions="2" minx="0" crs="" maxy="0" miny="0"/>
+          <spatial crs="" maxx="0" maxz="0" minz="0" maxy="0" minx="0" dimensions="2" miny="0"/>
           <temporal>
             <period>
               <start></start>
@@ -27458,58 +27462,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal startExpression="" durationField="" mode="0" enabled="0" fixedDuration="0" durationUnit="min" limitMode="0" endExpression="" accumulate="0" endField="" startField="">
+      <temporal endExpression="" enabled="0" endField="" durationField="" startExpression="" startField="" fixedDuration="0" mode="0" accumulate="0" limitMode="0" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" extrusion="0" zscale="1" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" binding="Centroid">
+      <elevation symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0" clamping="Terrain" binding="Centroid" respectLayerSymbol="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -27540,36 +27544,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -27584,44 +27588,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -27644,54 +27648,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" forceraster="0" type="nullSymbol" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0" referencescale="-1"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
           <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontKerning="1" fontWeight="75" legendString="Aa" namedStyle="Bold" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="8" isExpression="0" multilineHeight="1" fontItalic="0" textColor="31,120,180,255" blendMode="0" fieldName="label" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" useSubstitutions="0" fontSizeUnit="Point">
+              <text-style fieldName="label" forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="8" fontKerning="1" fontWeight="75" blendMode="0" useSubstitutions="0" capitalization="0" isExpression="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="31,120,180,255" fontWordSpacing="0" fontItalic="0" legendString="Aa" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="Bold" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="0.90000000000000002">
                 <families/>
-                <text-buffer bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128" bufferSize="0.75" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
-                <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-                <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,204" shapeOffsetY="-0.14999999999999999" shapeBorderWidth="0.75" shapeOpacity="0.59999999999999998" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0.5" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRadiiX="0.5" shapeSizeUnit="MM" shapeDraw="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSVGFile="">
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="markerSymbol">
+                <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="0" bufferSize="0.75" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+                <background shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeType="0" shapeSizeY="0.29999999999999999" shapeSVGFile="" shapeDraw="1" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0.75" shapeOffsetY="-0.14999999999999999" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeFillColor="255,255,255,204" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+                  <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="196,60,57,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -27714,34 +27718,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+                  <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                    <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,204" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.75" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -27756,56 +27760,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+                <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format placeDirectionSymbol="0" decimals="3" autoWrapLength="0" leftDirectionSymbol="&lt;" plussign="0" multilineAlign="1" formatNumbers="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" addDirectionSymbol="0" rightDirectionSymbol=">" wrapChar=""/>
-              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGenerator="" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" centroidInside="0" lineAnchorClipping="0" lineAnchorPercent="0.5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" rotationUnit="AngleDegrees" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" repeatDistance="0" yOffset="0" lineAnchorType="0" lineAnchorTextPoint="CenterOfText" distMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" overrunDistance="0" repeatDistanceUnits="MM" priority="5" preserveRotation="1" dist="0" maxCurvedCharAngleOut="-25" overlapHandling="PreventOverlap" placement="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" xOffset="1" overrunDistanceUnit="MM" polygonPlacementFlags="2" allowDegraded="0" distUnits="MM" fitInPolygonOnly="0" quadOffset="1" geometryGeneratorType="PointGeometry"/>
-              <rendering fontLimitPixelSize="0" scaleVisibility="0" mergeLines="0" fontMaxPixelSize="10000" minFeatureSize="0" labelPerPart="0" drawLabels="1" scaleMax="10000000" obstacleType="0" maxNumLabels="6" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" upsidedownLabels="0" unplacedVisibility="0" zIndex="5" obstacleFactor="0.76000000000000001" scaleMin="1"/>
+              <text-format wrapChar="" addDirectionSymbol="0" formatNumbers="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" multilineAlign="1" rightDirectionSymbol=">" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" leftDirectionSymbol="&lt;" decimals="3"/>
+              <placement overlapHandling="PreventOverlap" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" distMapUnitScale="3x:0,0,0,0,0,0" layerType="PolygonGeometry" quadOffset="1" preserveRotation="1" yOffset="0" xOffset="1" allowDegraded="0" geometryGenerator="" priority="5" lineAnchorType="0" rotationAngle="0" centroidInside="0" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" distUnits="MM" repeatDistance="0" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" overrunDistance="0" geometryGeneratorType="PointGeometry" overrunDistanceUnit="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placementFlags="10" offsetType="0" centroidWhole="1" lineAnchorClipping="0" dist="0" rotationUnit="AngleDegrees"/>
+              <rendering maxNumLabels="6" drawLabels="1" fontLimitPixelSize="0" scaleVisibility="0" fontMinPixelSize="3" unplacedVisibility="0" limitNumLabels="0" obstacleType="0" upsidedownLabels="0" labelPerPart="0" mergeLines="0" obstacle="1" scaleMin="1" minFeatureSize="0" scaleMax="10000000" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" zIndex="5"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; name=&quot;symbol&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; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -27814,17 +27818,17 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -27833,47 +27837,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penWidth="0" lineSizeScale="3x:0,0,0,0,0,0" penAlpha="255" opacity="1" rotationOffset="270" labelPlacementMethod="XHeight" showAxis="0" lineSizeType="MM" spacing="0" scaleDependency="Area" spacingUnit="MM" scaleBasedVisibility="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" height="15" width="15" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" barWidth="5" backgroundColor="#ffffff" maxScaleDenominator="1e+08" backgroundAlpha="255" minScaleDenominator="0" minimumSize="0" enabled="0" sizeType="MM">
-          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
-          <attribute field="" label="" colorOpacity="1" color="#000000"/>
+        <DiagramCategory spacingUnit="MM" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" backgroundColor="#ffffff" scaleDependency="Area" spacingUnitScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penColor="#000000" width="15" penWidth="0" diagramOrientation="Up" spacing="0" opacity="1" lineSizeType="MM" penAlpha="255" rotationOffset="270" minScaleDenominator="0" maxScaleDenominator="1e+08" direction="1" labelPlacementMethod="XHeight" barWidth="5" sizeType="MM" scaleBasedVisibility="0" height="15" minimumSize="0" backgroundAlpha="255">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
+          <attribute colorOpacity="1" field="" label="" color="#000000"/>
           <axisSymbol>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27904,9 +27908,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27914,22 +27918,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" dist="0" placement="0" showAll="1" linePlacementFlags="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" placement="0" linePlacementFlags="2" showAll="1" obstacle="0" priority="0">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option type="Map" name="QgsGeometryGapCheck">
-            <Option value="0" type="double" name="allowedGapsBuffer"/>
-            <Option value="false" type="bool" name="allowedGapsEnabled"/>
-            <Option value="" type="QString" name="allowedGapsLayer"/>
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -27940,8 +27944,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27950,8 +27954,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27960,8 +27964,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -27982,45 +27986,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" index="0" name=""/>
-        <alias field="table_set" index="1" name=""/>
-        <alias field="label" index="2" name=""/>
-        <alias field="races" index="3" name=""/>
-        <alias field="day" index="4" name=""/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="table_set" applyOnUpdate="0" expression=""/>
-        <default field="label" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint field="id" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="table_set" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="label" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="races" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
-        <constraint field="day" unique_strength="0" notnull_strength="0" constraints="0" exp_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="id" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="table_set" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="label" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="races" exp_strength="0" notnull_strength="0"/>
+        <constraint constraints="0" unique_strength="0" field="day" exp_strength="0" notnull_strength="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 field="day" desc="" exp=""/>
+        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" field="table_set" exp=""/>
+        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" field="races" exp=""/>
+        <constraint desc="" field="day" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <columns>
-          <column type="field" width="-1" name="id" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" name="table_set" hidden="0"/>
-          <column type="field" width="-1" name="label" hidden="0"/>
-          <column type="field" width="-1" name="day" hidden="0"/>
-          <column type="field" width="130" name="races" hidden="0"/>
+          <column hidden="0" width="-1" type="field" name="id"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column hidden="0" width="-1" type="field" name="table_set"/>
+          <column hidden="0" width="-1" type="field" name="label"/>
+          <column hidden="0" width="-1" type="field" name="day"/>
+          <column hidden="0" width="130" type="field" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28435,363 +28439,363 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option type="QString" value="" name="name"/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option type="QString" value="collection" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Cones" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{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="1" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Fencing and Cones"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Fencing and Cones"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
+      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{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" expanded="1" style="Fencing"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
       <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer expanded="1" id="water_tables20170921142016467" visible="0" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c" visible="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Routes"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <layer expanded="1" id="water_tables20170921142016467" visible="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -28818,31 +28822,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshals">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28857,49 +28861,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" id="" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28914,9 +28918,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28924,15 +28928,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="19.9422,32,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="5" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="128.508,3.98741,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="bevel" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.1,mm" position="128.508,3.98741,mm" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="128" red="128" green="128"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="128.508,3.98741,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="5" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="19.9422,32,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" position="128.508,3.98741,mm" groupUuid="" frameJoinStyle="bevel">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28940,37 +28944,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28978,62 +28982,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal map - inset" type="65639" positionLock="true" outlineWidthM="0.2,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" itemRotation="0" mapRotation="0" position="98.7828,149.027,mm" size="56.5192,54.5647,mm" excludeFromExports="0" zValue="4" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="4" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" drawCanvasItems="false" followPresetName="Marshal map - inset" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Inset map" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="98.7828,149.027,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="56.5192,54.5647,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91232887817815111" xmax="18.42437871848258268" xmin="18.42008617785988278" ymin="-33.91647297528887606"/>
+        <Extent ymin="-33.91647297528887606" ymax="-33.91232887817815111" xmax="18.42437871848258268" xmin="18.42008617785988278"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29064,44 +29068,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29124,40 +29128,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29172,29 +29176,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29202,28 +29206,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" show="1" inverted="0" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1" name="Overview 1">
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <ComposerMapOverview position="3" show="1" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" blendMode="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,65,170,127" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,102" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -29238,9 +29242,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29248,9 +29252,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29258,69 +29262,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal map - main" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" itemRotation="0" mapRotation="0" position="3.53,6.0007,mm" size="142,187.018,mm" excludeFromExports="0" zValue="3" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="3" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" drawCanvasItems="false" followPresetName="Marshal map - main" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Main map" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="3.53,6.0007,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="142,187.018,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91372455973290556" xmax="18.4227460039006381" xmin="18.42171889244182736" ymin="-33.91507729373412161"/>
+        <Extent ymin="-33.91507729373412161" ymax="-33.91372455973290556" xmax="18.4227460039006381" xmin="18.42171889244182736"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29351,44 +29355,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29411,40 +29415,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29459,29 +29463,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29489,22 +29493,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" sectionHeight="187.018" frame="false" referencePoint="2" sectionWidth="142.117" opacity="1" sectionX="0" type="65647" positionLock="true" outlineWidthM="0.3,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" id="" itemRotation="0" position="290.617,6.0007,mm" size="142.117,187.018,mm" excludeFromExports="0" zValue="2" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" groupUuid="" frameJoinStyle="round" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionY="0" hidePageIfEmpty="0" positionOnPage="290.617,6.0007,mm" hideBackgroundIfEmpty="0" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="119" red="119" green="119"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" groupUuid="" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" frameJoinStyle="round" blendMode="0" sectionX="0" hidePageIfEmpty="0" outlineWidthM="0.3,mm" sectionY="0" position="290.617,6.0007,mm" hideBackgroundIfEmpty="0" type="65647" itemRotation="0" opacity="1" sectionWidth="142.117" sectionHeight="187.018" positionOnPage="290.617,6.0007,mm" excludeFromExports="0" referencePoint="2" size="142.117,187.018,mm" visibility="1" background="false">
+        <FrameColor alpha="255" blue="119" green="119" red="119"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29512,21 +29516,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="47.1065" pictureRotation="0" mapUuid="" anchorPoint="0" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="25.2491" svgFillColor="255,255,255,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" id="" itemRotation="0" position="246.665,178.41,mm" size="47.1065,27.6,mm" excludeFromExports="0" zValue="1" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionOnPage="246.665,178.41,mm" northMode="0" file="../GunRun2022_500.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="1" northMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" id="" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_500.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="246.665,178.41,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="0" opacity="1" pictureWidth="47.1065" svgFillColor="255,255,255,255" positionOnPage="246.665,178.41,mm" excludeFromExports="0" referencePoint="0" size="47.1065,27.6,mm" visibility="1" mapUuid="" background="false" pictureHeight="25.2491">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29534,14 +29538,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;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  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>" stylesheetEnabled="true" url="" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" type="65648" useSmartBreaks="true" resizeMode="0" contentMode="1" 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;}">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" url="" useSmartBreaks="true" contentMode="1" type="65648" evaluateExpressions="true" uuid="{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;}" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  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">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29551,60 +29555,60 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" 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="0" type="QString" name="imageCropMarginUnit"/>
-          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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" 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="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="0" name="imageCropMarginUnit"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="rasterize"/>
+          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerName="marshal_positions" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" coverageLayerProvider="ogr" hideCoverage="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <Atlas enabled="1" sortKey="&quot;id&quot;" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayerName="marshal_positions" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29619,49 +29623,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" id="" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29676,9 +29680,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29686,21 +29690,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="6.31767" pictureRotation="330" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" anchorPoint="0" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="7.97477" svgFillColor="255,255,255,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" id="" itemRotation="0" position="286.027,2,mm" size="9.45865,11,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionOnPage="286.027,2,mm" northMode="0" file="arrows/NorthArrow_11.svg" mode="0" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" id="" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="arrows/NorthArrow_11.svg" frameJoinStyle="miter" blendMode="0" mode="0" pictureRotation="330" northOffset="0" outlineWidthM="0.3,mm" position="286.027,2,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="0" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" positionOnPage="286.027,2,mm" excludeFromExports="0" referencePoint="0" size="9.45865,11,mm" visibility="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" pictureHeight="7.97477">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29708,47 +29712,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="[%upper( &quot;area&quot; )%]" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" itemRotation="270" position="285.027,205.886,mm" size="142.543,10.3185,mm" excludeFromExports="0" marginX="1" zValue="3" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionOnPage="285.027,205.886,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" id="" labelText="[%upper( &quot;area&quot; )%]" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="285.027,205.886,mm" marginY="1" type="65641" itemRotation="270" opacity="1" htmlState="0" positionOnPage="285.027,205.886,mm" excludeFromExports="0" referencePoint="0" halign="1" size="142.543,10.3185,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29763,65 +29767,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="100" size="145.54,16.2165,mm" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" background="false" style="Single Box" outlineWidth="0.3" zValue="2" height="3" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" positionOnPage="7,189.669,mm" segmentMillimeters="26.3519" blendMode="0" minBarWidth="50" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="3" labelHorizontalPlacement="0" lineJoinStyle="miter" frameJoinStyle="miter" visibility="1" maxBarWidth="150" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="1" alignment="0" lineCapStyle="square" position="7,189.669,mm" numSegments="4" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="7,189.669,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="4" segmentMillimeters="26.3519" excludeFromExports="0" maxBarWidth="150" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" id="" height="3" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="3" boxContentSpace="1" itemRotation="0" visibility="1" referencePoint="0" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" lineCapStyle="square" style="Single Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="miter" outlineWidth="0.3" labelVerticalPlacement="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" position="7,189.669,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="100" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29836,75 +29840,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29935,52 +29939,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30011,52 +30015,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30087,36 +30091,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -30131,36 +30135,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30175,87 +30179,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Start/Finish" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" itemRotation="0" mapRotation="330" position="7,5.5,mm" size="278.027,180.318,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" positionOnPage="7,5.5,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" drawCanvasItems="false" followPresetName="Start/Finish" labelMargin="0,mm" mapRotation="330" groupUuid="" id="" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="7,5.5,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="7,5.5,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="278.027,180.318,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="rotation" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="id" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30286,44 +30290,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30346,9 +30350,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30365,32 +30369,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30405,29 +30409,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30435,65 +30439,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
+          <Option type="QString" value="0" name="svgCropMarginBottom"/>
+          <Option type="QString" value="0" name="svgCropMarginLeft"/>
+          <Option type="QString" value="0" name="svgCropMarginRight"/>
+          <Option type="QString" value="0" name="svgCropMarginTop"/>
+          <Option type="QString" value="true" name="svgCropToContents"/>
+          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
+          <Option type="QString" value="false" name="svgGroupLayers"/>
+          <Option type="QString" value="1" name="svgIncludeMetadata"/>
+          <Option type="QString" value="0" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="start_finish_area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;area&quot;" sortKey="area" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+      <Atlas enabled="1" sortKey="area" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayerName="start_finish_area" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Fencing">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30508,49 +30512,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" id="" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30565,9 +30569,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30575,15 +30579,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="38.1563,67.2879,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="11" titleAlignment="1" resizeToContents="0" boxSpace="2" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,5.21277,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="256.808,5.21277,mm" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="256.808,5.21277,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="11" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="0" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="38.1563,67.2879,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" position="256.808,5.21277,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30591,53 +30595,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" style="Bold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0" italic="0" bold="1" style="Bold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30645,47 +30649,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="FENCING: [% &quot;name&quot; %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" itemRotation="0" position="6.76779,191.188,mm" size="148.46,6.45211,mm" excludeFromExports="0" marginX="0" zValue="10" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionOnPage="6.76779,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" id="" labelText="FENCING: [% &quot;name&quot; %]" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" referencePoint="0" halign="1" size="148.46,6.45211,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30700,65 +30704,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" id="" itemRotation="0" position="182.723,191.188,mm" size="56.3557,6.45237,mm" excludeFromExports="0" marginX="0" zValue="9" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionOnPage="182.723,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" groupUuid="" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="182.723,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="182.723,191.188,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.3557,6.45237,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30773,65 +30777,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" itemRotation="0" position="209.146,198.083,mm" size="26.8205,6.82826,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionOnPage="209.146,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="209.146,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="209.146,198.083,mm" excludeFromExports="0" referencePoint="0" halign="2" size="26.8205,6.82826,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30846,65 +30850,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" id="" itemRotation="0" position="62.6706,198.083,mm" size="51.1638,7.07327,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionOnPage="62.6706,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" groupUuid="" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="51.1638,7.07327,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30919,65 +30923,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" itemRotation="0" position="116.805,198.083,mm" size="64.7594,7.10512,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionOnPage="116.805,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="116.805,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="64.7594,7.10512,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30992,65 +30996,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% @atlas_featurenumber %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" itemRotation="0" position="6.76779,198.083,mm" size="52.7903,7.07327,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionOnPage="6.76779,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" id="" labelText="Page [% @atlas_featurenumber %]" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="52.7903,7.07327,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31065,39 +31069,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" id="" itemRotation="0" position="243.098,175.353,mm" size="49.3143,29.8354,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionOnPage="243.098,175.353,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" id="" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.098,175.353,mm" excludeFromExports="0" referencePoint="0" size="49.3143,29.8354,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31105,42 +31109,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" itemRotation="0" position="6.91779,197.79,mm" size="232.01,0.14328,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" shapeType="1" id="" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31155,55 +31159,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="20" size="109.51,15.8378,mm" groupUuid="" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" background="false" style="Double Box" outlineWidth="0.2" zValue="2" height="2" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="33.2496" blendMode="0" minBarWidth="25" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="1" labelHorizontalPlacement="0" lineJoinStyle="round" frameJoinStyle="miter" visibility="1" maxBarWidth="100" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="0.2" alignment="0" lineCapStyle="square" position="6.76779,2.8482,mm" numSegments="2" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="2" segmentMillimeters="33.2496" excludeFromExports="0" maxBarWidth="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" id="" height="2" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="1" boxContentSpace="0.2" itemRotation="0" visibility="1" referencePoint="0" size="109.51,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" lineCapStyle="square" style="Double Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="round" outlineWidth="0.2" labelVerticalPlacement="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" position="6.76779,2.8482,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="20" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31218,75 +31222,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31317,52 +31321,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31393,52 +31397,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -31469,36 +31473,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -31513,36 +31517,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31557,53 +31561,53 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="0.9" followPresetName="Fencing" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" itemRotation="0" mapRotation="0" position="6.76779,9.35102,mm" size="283.418,180.92,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" drawCanvasItems="false" followPresetName="Fencing" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" type="65639" itemRotation="0" opacity="0.9" positionOnPage="6.76779,9.35102,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="283.418,180.92,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90720180625844904" xmax="18.40522072458854552" xmin="18.40368928312333452" ymin="-33.90817940102682115"/>
+        <Extent ymin="-33.90817940102682115" ymax="-33.90720180625844904" xmax="18.40522072458854552" xmin="18.40368928312333452"/>
         <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>
@@ -31618,45 +31622,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31687,44 +31691,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31747,9 +31751,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31766,32 +31770,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31806,29 +31810,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31836,65 +31840,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" 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="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="fence_and_cone_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+      <Atlas enabled="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerName="fence_and_cone_groups" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="9" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="9" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31909,49 +31913,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" id="" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31966,59 +31970,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="64" visibility="1" labelText="Directions to Start of Race" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" itemRotation="0" position="4.43449,186.634,mm" size="83.9998,10.4638,mm" excludeFromExports="0" marginX="1" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionOnPage="4.43449,186.634,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" id="" labelText="Directions to Start of Race" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="4.43449,186.634,mm" excludeFromExports="0" referencePoint="0" halign="1" size="83.9998,10.4638,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32033,65 +32037,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Gun Run" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" itemRotation="0" position="4.43449,197.498,mm" size="48.2923,9.511,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionOnPage="4.43449,197.498,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" id="" labelText="Gun Run" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="4.43449,197.498,mm" excludeFromExports="0" referencePoint="0" halign="1" size="48.2923,9.511,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32106,33 +32110,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem size="59.0766,76,mm" symbolHeight="5" lineSpacing="2" groupUuid="" itemRotation="0" background="true" columnSpace="0" zValue="6" legendFilterByMap="1" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="false" splitLayer="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendHeight="25" referencePoint="0" symbolWidth="9" id="" fontColor="#000000" frameJoinStyle="round" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="10.096,10.8563,mm" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="0" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="139" red="139" green="139"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="10.096,10.8563,mm" wmsLegendHeight="25" positionLock="false" symbolHeight="5" zValue="6" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" legendFilterByMap="1" excludeFromExports="0" fontColor="#000000" lineSpacing="2" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" id="" splitLayer="0" symbolWidth="9" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="0" size="59.0766,76,mm" titleAlignment="1" columnSpace="0" title="" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" position="10.096,10.8563,mm" groupUuid="" frameJoinStyle="round">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32140,52 +32144,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="subgroup">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="3" alignment="1" name="symbolLabel" marginTop="2.5">
-            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="3" marginTop="2.5" name="symbolLabel">
+            <styleFont description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Ask Me">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option type="QString" value="hidden" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="poi_labels" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
+                  <Option type="QString" value="Toilets" name="legend/label-1"/>
+                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
+                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
+                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
+                  <Option type="QString" value="Parking" name="legend/label-5"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="directions_to_start" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
+                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
+                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32193,47 +32197,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 1.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" itemRotation="0" position="221.862,190.027,mm" size="27.7839,6.871,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionOnPage="221.862,190.027,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" id="" labelText="REVISION 1.0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="221.862,190.027,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="221.862,190.027,mm" excludeFromExports="0" referencePoint="0" halign="2" size="27.7839,6.871,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32248,65 +32252,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="false" outlineWidthM="0.3,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" itemRotation="0" position="197.975,197.498,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="4" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionOnPage="197.975,197.498,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="197.975,197.498,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="197.975,197.498,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32321,39 +32325,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="24.2337" pictureRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" anchorPoint="4" opacity="1" type="65640" positionLock="false" outlineWidthM="0.3,mm" pictureHeight="24.3824" svgFillColor="255,255,255,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" id="" itemRotation="0" position="249.646,179.724,mm" size="42.9838,24.3824,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionOnPage="249.646,179.724,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" id="" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" svgBorderWidth="0.2" positionLock="false" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="249.646,179.724,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" positionOnPage="249.646,179.724,mm" excludeFromExports="0" referencePoint="0" size="42.9838,24.3824,mm" visibility="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="false" pictureHeight="24.3824">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32361,42 +32365,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="false" outlineWidthM="0.3,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" itemRotation="0" position="4.58449,197.248,mm" size="244.912,0.1,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" shapeType="1" id="" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="4.58449,197.248,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32411,46 +32415,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Ask Me" type="65639" positionLock="false" outlineWidthM="0.3,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" itemRotation="0" mapRotation="0" position="4.43449,6.411,mm" size="288.007,183.616,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" drawCanvasItems="false" followPresetName="Ask Me" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="4.43449,6.411,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="288.007,183.616,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <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>
@@ -32465,45 +32469,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32534,44 +32538,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32594,40 +32598,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32642,29 +32646,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32672,56 +32676,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" filterFeatures="0" sortFeatures="0" pageNameExpression="" hideCoverage="0" coverageLayer=""/>
+      <Atlas enabled="0" filterFeatures="0" coverageLayer="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="" name="Routes">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32736,49 +32740,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" id="" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32793,59 +32797,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" itemRotation="0" position="200.171,199.082,mm" size="61.5373,6.8714,mm" excludeFromExports="0" marginX="0" zValue="13" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionOnPage="200.171,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="200.171,199.082,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="200.171,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="61.5373,6.8714,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32860,65 +32864,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" itemRotation="0" position="9.7863,192.073,mm" size="61.5373,6.60801,mm" excludeFromExports="0" marginX="0" zValue="12" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionOnPage="9.7863,192.073,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" id="" labelText="Gun Run 2022: [%&quot;Source&quot;%]" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.7863,192.073,mm" excludeFromExports="0" referencePoint="0" halign="1" size="61.5373,6.60801,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32933,65 +32937,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" itemRotation="0" position="9.7863,199.082,mm" size="61.5373,6.60801,mm" excludeFromExports="0" marginX="0" zValue="11" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionOnPage="9.7863,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" id="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.7863,199.082,mm" excludeFromExports="0" referencePoint="0" halign="1" size="61.5373,6.60801,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33006,39 +33010,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="29.7523" pictureRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="15.9472" svgFillColor="255,255,255,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="10" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionOnPage="262.196,188.218,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" northMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" id="" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="false" pictureHeight="15.9472">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33046,42 +33050,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" itemRotation="0" position="9.57644,198.832,mm" size="251.982,0.1,mm" excludeFromExports="0" zValue="9" groupUuid="" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" positionOnPage="9.57644,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" shapeType="1" id="" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.57644,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33096,321 +33100,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" itemRotation="0" mapRotation="0" position="9.57644,5.42566,mm" size="107.861,186.385,mm" excludeFromExports="0" zValue="8" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" keepLayerSet="false" positionOnPage="9.57644,5.42566,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Trail Finish" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,5.42566,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.57644,5.42566,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="107.861,186.385,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" itemRotation="0" mapRotation="0" position="112.643,4.09761,mm" size="179.156,189.279,mm" excludeFromExports="0" zValue="7" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" keepLayerSet="false" positionOnPage="112.643,4.09761,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Trail Start" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="112.643,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="112.643,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="179.156,189.279,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" itemRotation="0" mapRotation="0" position="5.86559,4.09761,mm" size="67.7828,166.874,mm" excludeFromExports="0" zValue="6" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" drawCanvasItems="false" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Left inset 21KM" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.86559,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="67.7828,166.874,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" itemRotation="0" mapRotation="0" position="133.191,119.125,mm" size="113.3,76.1023,mm" excludeFromExports="0" zValue="5" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" positionOnPage="133.191,119.125,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="144" red="103" green="34"/>
-        <BackgroundColor alpha="255" blue="215" red="200" green="175"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Bottom inset 21KM" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="133.191,119.125,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="133.191,119.125,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="113.3,76.1023,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" id="End inset Trail" itemRotation="0" mapRotation="0" position="19.6693,7.89412,mm" size="68.3676,117.12,mm" excludeFromExports="0" zValue="4" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" keepLayerSet="false" positionOnPage="19.6693,7.89412,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="End inset Trail" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="19.6693,7.89412,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="19.6693,7.89412,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="68.3676,117.12,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" id="Start inset Trail" itemRotation="0" mapRotation="0" position="170.062,49.6297,mm" size="63.655,88.3012,mm" excludeFromExports="0" zValue="3" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" keepLayerSet="false" positionOnPage="170.062,49.6297,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Start inset Trail" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="170.062,49.6297,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="170.062,49.6297,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="63.655,88.3012,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="0" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{917a530c-14f4-4ed8-b109-961939435221}" id="Contour inset Trail" itemRotation="0" mapRotation="0" position="200.321,125.314,mm" size="75.8756,69.7635,mm" excludeFromExports="0" zValue="2" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" keepLayerSet="false" positionOnPage="200.321,125.314,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Contour inset Trail" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="200.321,125.314,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="200.321,125.314,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="75.8756,69.7635,mm" visibility="0" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="1">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Routes" type="65639" positionLock="false" outlineWidthM="0.15,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" itemRotation="0" mapRotation="0" position="9.50144,5.50066,mm" size="282.372,186.105,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" positionOnPage="9.50144,5.50066,mm" blendMode="0" drawCanvasItems="true" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" drawCanvasItems="true" followPresetName="Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="Main Map" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" positionLock="false" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.50144,5.50066,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="282.372,186.105,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.392'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975544251798567" xmax="18.45388998618362919" xmin="18.36400000000000077" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" ymax="-33.89975544251798567" xmax="18.45388998618362919" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33441,44 +33445,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33501,40 +33505,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33549,29 +33553,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33579,34 +33583,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" show="1" inverted="0" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0" name="Overview 1">
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <ComposerMapOverview position="3" show="1" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" blendMode="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="103,34,144,26" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -33621,9 +33625,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33631,9 +33635,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33641,63 +33645,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerName="all_routes" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortAscending="1" enabled="1" filterFeatures="1" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <Atlas enabled="1" sortKey="&quot;Sort&quot;" filterFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshal Plan A1">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33712,49 +33716,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" itemRotation="0" position="0,0,mm" size="594,841,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" id="" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="594,841,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33769,9 +33773,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33779,15 +33783,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="4,4,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="8" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="false" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="25.5925,18.7971,mm" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="25.5925,18.7971,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="8" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="false" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="4,4,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" position="25.5925,18.7971,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33795,37 +33799,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0">
+            <layer-tree-layer expanded="1" checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="QString" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33833,47 +33837,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="MARSHAL POSITIONS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" itemRotation="0" position="5.2963,808.939,mm" size="91.9494,15.0649,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionOnPage="5.2963,808.939,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" id="" labelText="MARSHAL POSITIONS" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="5.2963,808.939,mm" excludeFromExports="0" referencePoint="0" halign="1" size="91.9494,15.0649,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33888,65 +33892,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 1.2" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" itemRotation="0" position="430.403,825.052,mm" size="56.6212,15.3656,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionOnPage="430.403,825.052,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" id="" labelText="REVISION 1.2" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="430.403,825.052,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="430.403,825.052,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.6212,15.3656,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33961,65 +33965,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" itemRotation="0" position="372.175,808.942,mm" size="114.848,15.0635,mm" excludeFromExports="0" marginX="1" zValue="4" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionOnPage="372.175,808.942,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="372.175,808.942,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="372.175,808.942,mm" excludeFromExports="0" referencePoint="0" halign="2" size="114.848,15.0635,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34034,39 +34038,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="63.5856" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="63.9757" svgFillColor="255,255,255,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" id="" itemRotation="0" position="489.557,775.395,mm" size="100.498,63.9757,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionOnPage="489.557,775.395,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" id="" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="489.557,775.395,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" positionOnPage="489.557,775.395,mm" excludeFromExports="0" referencePoint="0" size="100.498,63.9757,mm" visibility="1" mapUuid="" background="false" pictureHeight="63.9757">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34074,42 +34078,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" itemRotation="0" position="5.4463,824.155,mm" size="481.428,0.606138,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" shapeType="1" id="" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="5.4463,824.155,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34124,90 +34128,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal plan" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" itemRotation="0" mapRotation="0" position="3.94474,5.25965,mm" size="584.759,811.213,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" drawCanvasItems="false" followPresetName="Marshal plan" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="3.94474,5.25965,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="584.759,811.213,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="complete_marshal_overview" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;page&quot;" sortKey="page" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+      <Atlas enabled="1" sortKey="page" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerName="complete_marshal_overview" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="" name="Access Roads">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34222,49 +34226,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" id="" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34279,27 +34283,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem size="34.45,40.8,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="15" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="244.484,130.172,mm" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="0" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="185" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="244.484,130.172,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="15" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="0" size="34.45,40.8,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" position="244.484,130.172,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34307,35 +34311,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Residents Access">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="residents_access_roads" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34343,47 +34347,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" itemRotation="0" position="9.37446,191.81,mm" size="194.851,7.272,mm" excludeFromExports="0" marginX="0" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionOnPage="9.37446,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" id="" labelText="ACCESS ROUTES FOR RESIDENTS" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" referencePoint="0" halign="1" size="194.851,7.272,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34398,65 +34402,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="REVISION 1.1" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" itemRotation="0" position="204.225,191.81,mm" size="57.4836,6.8714,mm" excludeFromExports="0" marginX="1" zValue="6" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionOnPage="204.225,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" id="" labelText="REVISION 1.1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="204.225,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" referencePoint="0" halign="2" size="57.4836,6.8714,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34471,65 +34475,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" itemRotation="0" position="210.038,199.082,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionOnPage="210.038,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="210.038,199.082,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34544,39 +34548,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="17.3653" pictureRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="17.4718" svgFillColor="255,255,255,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionOnPage="262.196,188.218,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" id="" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="false" pictureHeight="17.4718">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34584,42 +34588,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" itemRotation="0" position="9.59946,198.832,mm" size="251.959,0.1,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" shapeType="1" id="" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34634,61 +34638,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Access Routes" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" itemRotation="0" mapRotation="0" position="5.86559,4.09761,mm" size="67.7828,166.874,mm" excludeFromExports="0" zValue="2" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" drawCanvasItems="false" followPresetName="Access Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.86559,4.09761,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="67.7828,166.874,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <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>
@@ -34703,45 +34707,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34772,44 +34776,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34832,40 +34836,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34880,29 +34884,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34910,45 +34914,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="true" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Access Routes" type="65639" positionLock="true" outlineWidthM="0.15,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" itemRotation="0" mapRotation="0" position="9.44946,9.08557,mm" size="282.012,175.592,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="true" isTemporal="0" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" drawCanvasItems="false" followPresetName="Access Routes" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" positionLock="true" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.44946,9.08557,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="282.012,175.592,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <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>
@@ -34963,45 +34967,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -35032,44 +35036,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35092,40 +35096,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35140,29 +35144,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35170,56 +35174,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <Atlas enabled="1" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="144" units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35234,49 +35238,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" id="" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35291,59 +35295,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" page="0" position="0" orientation="2"/>
+          <Guide position="0" page="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem valign="64" visibility="1" labelText="Access to P9 Parking and VIP Tent" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" itemRotation="0" position="9.37446,191.81,mm" size="194.851,7.272,mm" excludeFromExports="0" marginX="0" zValue="8" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionOnPage="9.37446,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" id="" labelText="Access to P9 Parking and VIP Tent" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" referencePoint="0" halign="1" size="194.851,7.272,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="14" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="14" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35358,65 +35362,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="REVISION 1.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" itemRotation="0" position="204.225,191.81,mm" size="57.4836,6.8714,mm" excludeFromExports="0" marginX="1" zValue="6" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionOnPage="204.225,191.81,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" id="" labelText="REVISION 1.0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="204.225,191.81,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" referencePoint="0" halign="2" size="57.4836,6.8714,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35431,65 +35435,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="Sunday, 20 October 2019" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" itemRotation="0" position="210.038,199.082,mm" size="51.6706,6.60801,mm" excludeFromExports="0" marginX="1" zValue="5" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionOnPage="210.038,199.082,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" id="" labelText="Sunday, 20 October 2019" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="210.038,199.082,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" referencePoint="0" halign="2" size="51.6706,6.60801,mm" visibility="1" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35504,39 +35508,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="17.3653" pictureRotation="0" mapUuid="" anchorPoint="4" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="17.4718" svgFillColor="255,255,255,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" id="" itemRotation="0" position="262.196,188.218,mm" size="29.7523,17.4718,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionOnPage="262.196,188.218,mm" northMode="0" file="../Gun_Run_Logo.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" id="" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../Gun_Run_Logo.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="262.196,188.218,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="4" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" positionOnPage="262.196,188.218,mm" excludeFromExports="0" referencePoint="0" size="29.7523,17.4718,mm" visibility="1" mapUuid="" background="false" pictureHeight="17.4718">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35544,42 +35548,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" itemRotation="0" position="9.59946,198.832,mm" size="251.959,0.1,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" shapeType="1" id="" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35594,46 +35598,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="false" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="" type="65639" positionLock="false" outlineWidthM="0.15,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" itemRotation="0" mapRotation="0" position="9.44946,7.25098,mm" size="282.012,182.649,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="round" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" drawCanvasItems="false" followPresetName="" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" positionLock="false" frameJoinStyle="round" blendMode="0" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="9.44946,7.25098,mm" excludeFromExports="0" referencePoint="0" followPreset="false" size="282.012,182.649,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <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>
@@ -35648,45 +35652,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="0" topAnnotationDisplay="0" intervalX="0" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" maximumIntervalWidth="100" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationDisplay="0" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="0" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="0" intervalX="0" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="0" leftAnnotationDisplay="0" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="0" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="0" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="0" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="0" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -35717,44 +35721,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -35777,40 +35781,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -35825,29 +35829,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35855,56 +35859,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" filterFeatures="0" sortFeatures="0" pageNameExpression="&quot;FID&quot;" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+      <Atlas enabled="0" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="120" units="mm" worldFileMap="" name="Marshal Plan">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -35919,49 +35923,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" itemRotation="0" position="0,0,mm" size="297,420,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" id="" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,420,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -35976,9 +35980,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35986,47 +35990,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% &quot;page&quot; %] " marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" id="" itemRotation="0" position="112.086,406.476,mm" size="23.5967,8.3142,mm" excludeFromExports="0" marginX="0" zValue="9" halign="4" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionOnPage="112.086,406.476,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" groupUuid="" id="" labelText="Page [% &quot;page&quot; %] " templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="112.086,406.476,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="112.086,406.476,mm" excludeFromExports="0" referencePoint="0" halign="4" size="23.5967,8.3142,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36041,65 +36045,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" itemRotation="0" position="214.292,406.874,mm" size="27.7839,7.51682,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionOnPage="214.292,406.874,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="214.292,406.874,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="214.292,406.874,mm" excludeFromExports="0" referencePoint="0" halign="2" size="27.7839,7.51682,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36114,33 +36118,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem size="21.6797,33,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="7" titleAlignment="1" resizeToContents="1" boxSpace="2" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" positionOnPage="15.6525,12.5708,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="false" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="15.6525,12.5708,mm" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="15.6525,12.5708,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="7" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="false" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="1" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="21.6797,33,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" position="15.6525,12.5708,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36148,37 +36152,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" alignment="1" name="group">
-            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="1">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="1" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2" name="symbol">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36186,47 +36190,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="MARSHAL POSITIONS" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" itemRotation="0" position="5.69321,398.344,mm" size="45.1194,8.13137,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionOnPage="5.69321,398.344,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" id="" labelText="MARSHAL POSITIONS" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="5.69321,398.344,mm" excludeFromExports="0" referencePoint="0" halign="1" size="45.1194,8.13137,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36241,65 +36245,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" 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>" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" id="" itemRotation="0" position="5.69321,406.988,mm" size="118.192,7.80192,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionOnPage="5.69321,406.988,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" groupUuid="" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="5.69321,406.988,mm" excludeFromExports="0" referencePoint="0" halign="1" size="118.192,7.80192,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36314,65 +36318,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" 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>" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" id="" itemRotation="0" position="148.501,398.344,mm" size="93.5757,8.13167,mm" excludeFromExports="0" marginX="0" zValue="4" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionOnPage="148.501,398.344,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" groupUuid="" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="148.501,398.344,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="148.501,398.344,mm" excludeFromExports="0" referencePoint="0" halign="2" size="93.5757,8.13167,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36387,39 +36391,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" id="" itemRotation="0" position="243.319,382.696,mm" size="49.3143,31.2967,mm" excludeFromExports="0" zValue="3" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionOnPage="243.319,382.696,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" northMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" id="" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.319,382.696,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.319,382.696,mm" excludeFromExports="0" referencePoint="0" size="49.3143,31.2967,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36427,42 +36431,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" itemRotation="0" position="5.84321,406.626,mm" size="236.083,0.14328,mm" excludeFromExports="0" zValue="2" groupUuid="" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" shapeType="1" id="" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="5.84321,406.626,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -36477,97 +36481,97 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="1" followPresetName="Marshal plan" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" itemRotation="0" mapRotation="0" position="5.03,5.9483,mm" size="286.94,392.396,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" blendMode="0" drawCanvasItems="false" background="true">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" drawCanvasItems="false" followPresetName="Marshal plan" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" type="65639" itemRotation="0" opacity="1" positionOnPage="5.03,5.9483,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="286.94,392.396,mm" visibility="1" keepLayerSet="false" background="true">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226"/>
+        <Extent ymin="-33.91890002608484167" ymax="-33.89580042337001231" xmax="18.41474568521422484" xmin="18.39785407807089612"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~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~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="marshal_overviews" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;page&quot;" sortKey="page" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+      <Atlas enabled="1" sortKey="page" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerName="marshal_overviews" sortAscending="1"/>
     </Layout>
-    <Layout printResolution="300" units="mm" worldFileMap="" name="Fencing - Cones only">
-      <Snapper snapToGrid="0" snapToItems="1" tolerance="5" snapToGuides="1"/>
-      <Grid offsetY="0" offsetUnits="mm" resolution="10" offsetX="0" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGuides="1" snapToGrid="0" snapToItems="1"/>
+      <Grid offsetY="0" resUnits="mm" resolution="10" offsetX="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -36582,49 +36586,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65638" positionLock="false" outlineWidthM="0.3,mm" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" itemRotation="0" position="0,0,mm" size="297,210,mm" excludeFromExports="0" zValue="0" groupUuid="" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionOnPage="0,0,mm" blendMode="0" background="true">
-          <FrameColor alpha="255" blue="0" red="0" green="0"/>
-          <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+        <LayoutItem frame="false" zValue="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" id="" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" type="65638" itemRotation="0" opacity="1" positionOnPage="0,0,mm" excludeFromExports="0" referencePoint="0" size="297,210,mm" visibility="1" background="true">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -36639,9 +36643,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36649,15 +36653,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem size="38.1563,53.7608,mm" symbolHeight="4" lineSpacing="1" groupUuid="" itemRotation="0" background="true" columnSpace="2" zValue="11" titleAlignment="1" resizeToContents="0" boxSpace="2" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" positionOnPage="256.808,5.21277,mm" maxSymbolSize="0" blendMode="0" wmsLegendWidth="50" frame="true" rasterBorderColor="0,0,0,255" positionLock="true" splitLayer="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendHeight="25" referencePoint="0" symbolWidth="7" id="" fontColor="#000000" frameJoinStyle="miter" minSymbolSize="0" visibility="1" type="65642" rasterBorderWidth="0" outlineWidthM="0.3,mm" position="256.808,5.21277,mm" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" symbolAlignment="1" equalColumnWidth="1" wrapChar="" columnCount="1" rasterBorder="1" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="256.808,5.21277,mm" wmsLegendHeight="25" positionLock="true" symbolHeight="4" zValue="11" boxSpace="2" type="65642" rasterBorderColor="0,0,0,255" background="true" legendFilterByAtlas="0" columnCount="1" minSymbolSize="0" symbolAlignment="1" frame="true" rasterBorderWidth="0" excludeFromExports="0" fontColor="#000000" lineSpacing="1" wmsLegendWidth="50" wrapChar="" maxSymbolSize="0" rasterBorder="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" id="" splitLayer="0" symbolWidth="7" opacity="1" resizeToContents="0" itemRotation="0" visibility="1" referencePoint="0" equalColumnWidth="1" size="38.1563,53.7608,mm" titleAlignment="1" columnSpace="2" title="" outlineWidthM="0.3,mm" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" position="256.808,5.21277,mm" groupUuid="" frameJoinStyle="miter">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36665,53 +36669,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" alignment="1" name="title">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" style="Bold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0" italic="0" bold="1" style="Bold"/>
           </style>
-          <style indent="0" alignment="1" name="group" marginTop="3">
-            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="group">
+            <styleFont description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="subgroup" marginTop="3">
-            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" style="Semibold" strikethrough="0" bold="1" underline="0"/>
+          <style alignment="1" indent="0" marginTop="3" name="subgroup">
+            <styleFont description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0" italic="0" bold="1" style="Semibold"/>
           </style>
-          <style indent="0" alignment="1" name="symbol" marginTop="2.5">
-            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" style="" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginTop="2.5" name="symbol">
+            <styleFont description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" italic="0" bold="0" style=""/>
           </style>
-          <style indent="0" marginLeft="2" alignment="1" name="symbolLabel" marginTop="2">
-            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" style="Regular" strikethrough="0" bold="0" underline="0"/>
+          <style alignment="1" indent="0" marginLeft="2" marginTop="2" name="symbolLabel">
+            <styleFont description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0" italic="0" bold="0" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Fencing and Cones">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="fencing" legend_split_behavior="0" source="./fencing.shp|layername=fencing">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="fencing" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group groupLayer="" expanded="1" checked="Qt::Checked" name="Routes">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" expanded="1" checked="Qt::Checked" patch_size="0,0" name="all_routes" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes">
+            <layer-tree-layer providerKey="ogr" expanded="1" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_exp="" legend_split_behavior="0" name="all_routes" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36719,47 +36723,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="CONES: [% &quot;name&quot; %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" itemRotation="0" position="6.76779,191.188,mm" size="148.46,6.45211,mm" excludeFromExports="0" marginX="0" zValue="10" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionOnPage="6.76779,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="10" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" id="" labelText="CONES: [% &quot;name&quot; %]" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" referencePoint="0" halign="1" size="148.46,6.45211,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="63" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="63" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36774,65 +36778,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="64" visibility="1" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" id="" itemRotation="0" position="182.723,191.188,mm" size="56.3557,6.45237,mm" excludeFromExports="0" marginX="0" zValue="9" halign="2" groupUuid="" htmlState="1" frameJoinStyle="miter" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" positionOnPage="182.723,191.188,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="9" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" groupUuid="" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="64" outlineWidthM="0.3,mm" position="182.723,191.188,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="1" positionOnPage="182.723,191.188,mm" excludeFromExports="0" referencePoint="0" halign="2" size="56.3557,6.45237,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36847,65 +36851,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="REVISION 5.0" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" itemRotation="0" position="209.146,198.083,mm" size="26.8205,6.82826,mm" excludeFromExports="0" marginX="0" zValue="8" halign="2" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionOnPage="209.146,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="8" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" id="" labelText="REVISION 5.0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="209.146,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="209.146,198.083,mm" excludeFromExports="0" referencePoint="0" halign="2" size="26.8205,6.82826,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36920,65 +36924,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" itemRotation="0" position="62.6706,198.083,mm" size="51.1638,7.07327,mm" excludeFromExports="0" marginX="1" zValue="7" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionOnPage="62.6706,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="7" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" marginY="1" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="51.1638,7.07327,mm" visibility="0" background="false" marginX="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -36993,65 +36997,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" id="" itemRotation="0" position="116.805,198.083,mm" size="64.7594,7.10512,mm" excludeFromExports="0" marginX="0" zValue="6" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionOnPage="116.805,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="6" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" groupUuid="" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="116.805,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="64.7594,7.10512,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37066,65 +37070,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem valign="32" visibility="1" labelText="Page [% @atlas_featurenumber %]" marginY="0" frame="false" referencePoint="0" opacity="1" type="65641" positionLock="true" outlineWidthM="0.3,mm" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" itemRotation="0" position="6.76779,198.083,mm" size="90.2083,7.07327,mm" excludeFromExports="0" marginX="0" zValue="5" halign="1" groupUuid="" htmlState="0" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionOnPage="6.76779,198.083,mm" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="5" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" id="" labelText="Page [% @atlas_featurenumber %]" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" frameJoinStyle="miter" blendMode="0" valign="32" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" marginY="0" type="65641" itemRotation="0" opacity="1" htmlState="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" referencePoint="0" halign="1" size="90.2083,7.07327,mm" visibility="1" background="false" marginX="0">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37139,39 +37143,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem svgBorderWidth="0.2" visibility="1" frame="false" referencePoint="0" pictureWidth="49.3143" pictureRotation="0" mapUuid="" anchorPoint="8" opacity="1" type="65640" positionLock="true" outlineWidthM="0.3,mm" pictureHeight="26.4325" svgFillColor="255,255,255,255" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" resizeMode="0" id="" itemRotation="0" position="243.098,175.353,mm" size="49.3143,29.8354,mm" excludeFromExports="0" zValue="4" groupUuid="" svgBorderColor="0,0,0,255" frameJoinStyle="miter" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionOnPage="243.098,175.353,mm" northMode="0" file="../GunRun2022_250.png" mode="1" blendMode="0" northOffset="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="4" northMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" id="" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" resizeMode="0" svgBorderWidth="0.2" positionLock="true" file="../GunRun2022_250.png" frameJoinStyle="miter" blendMode="0" mode="1" pictureRotation="0" northOffset="0" outlineWidthM="0.3,mm" position="243.098,175.353,mm" svgBorderColor="0,0,0,255" type="65640" itemRotation="0" anchorPoint="8" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" positionOnPage="243.098,175.353,mm" excludeFromExports="0" referencePoint="0" size="49.3143,29.8354,mm" visibility="1" mapUuid="" background="false" pictureHeight="26.4325">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37179,42 +37183,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" frame="false" referencePoint="0" opacity="1" type="65643" positionLock="true" outlineWidthM="0.3,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" itemRotation="0" position="6.91779,197.79,mm" size="232.01,0.14328,mm" excludeFromExports="0" zValue="3" groupUuid="" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" shapeType="1" blendMode="0" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" zValue="3" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" shapeType="1" id="" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" type="65643" itemRotation="0" opacity="1" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" referencePoint="0" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" visibility="1" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+        <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+          <layer enabled="1" locked="0" pass="0" class="SimpleFill">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -37229,55 +37233,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem numUnitsPerSegment="30" size="84.9787,15.8378,mm" groupUuid="" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" background="false" style="Double Box" outlineWidth="0.2" zValue="2" height="2" subdivisionsHeight="1.5" numSubdivisions="1" unitType="meters" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="25.0725" blendMode="0" minBarWidth="25" frame="false" positionLock="true" referencePoint="0" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1" id="" labelBarSpace="1" labelHorizontalPlacement="0" lineJoinStyle="round" frameJoinStyle="miter" visibility="1" maxBarWidth="100" type="65646" segmentSizeMode="1" outlineWidthM="0.3,mm" boxContentSpace="0.2" alignment="0" lineCapStyle="square" position="6.76779,2.8482,mm" numSegments="2" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" unitLabel="m" labelVerticalPlacement="0" excludeFromExports="0">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem blendMode="0" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" positionLock="true" labelHorizontalPlacement="0" zValue="2" type="65646" background="false" segmentSizeMode="1" frame="false" numSegments="2" segmentMillimeters="25.0725" excludeFromExports="0" maxBarWidth="100" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" id="" height="2" alignment="0" numMapUnitsPerScaleBarUnit="1" opacity="1" labelBarSpace="1" boxContentSpace="0.2" itemRotation="0" visibility="1" referencePoint="0" size="84.9787,15.8378,mm" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" minBarWidth="25" lineCapStyle="square" style="Double Box" unitLabel="m" outlineWidthM="0.3,mm" numSubdivisions="1" lineJoinStyle="round" outlineWidth="0.2" labelVerticalPlacement="0" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" position="6.76779,2.8482,mm" groupUuid="" unitType="meters" frameJoinStyle="miter" numUnitsPerSegment="30" subdivisionsHeight="1.5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="12" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+        <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="12" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
           <families/>
-          <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-          <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+          <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+          <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+          <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+            <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -37292,75 +37296,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+          <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" red="0" green="0"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" red="0" green="0"/>
-        <fillColor2 alpha="255" blue="255" red="255" green="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37391,52 +37395,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37467,52 +37471,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -37543,36 +37547,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -37587,36 +37591,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="">
+          <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+            <layer enabled="1" locked="0" pass="0" class="SimpleFill">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -37631,53 +37635,53 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem visibility="1" isTemporal="0" followPreset="true" frame="false" referencePoint="0" labelMargin="0,mm" opacity="0.9" followPresetName="Cones" type="65639" positionLock="true" outlineWidthM="0.3,mm" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" itemRotation="0" mapRotation="0" position="6.76779,9.35102,mm" size="283.418,180.92,mm" excludeFromExports="0" zValue="1" mapFlags="0" groupUuid="" frameJoinStyle="miter" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" blendMode="0" drawCanvasItems="false" background="false">
-        <FrameColor alpha="255" blue="0" red="0" green="0"/>
-        <BackgroundColor alpha="255" blue="255" red="255" green="255"/>
+      <LayoutItem frame="false" isTemporal="0" zValue="1" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" drawCanvasItems="false" followPresetName="Cones" labelMargin="0,mm" mapRotation="0" groupUuid="" id="" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" mapFlags="0" positionLock="true" frameJoinStyle="miter" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" type="65639" itemRotation="0" opacity="0.9" positionOnPage="6.76779,9.35102,mm" excludeFromExports="0" referencePoint="0" followPreset="true" size="283.418,180.92,mm" visibility="1" keepLayerSet="false" background="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 value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90025472328818523" xmax="18.40975312970203248" xmin="18.40670677609450223" ymin="-33.90219936134110412"/>
+        <Extent ymin="-33.90219936134110412" ymax="-33.90025472328818523" xmax="18.40975312970203248" xmin="18.40670677609450223"/>
         <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>
@@ -37692,45 +37696,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksMarginToCorner="0" frameFillColor1="255,255,255,255" gridFramePenThickness="0.5" unit="1" topAnnotationDisplay="3" intervalX="5" rotatedTicksLengthMode="0" bottomAnnotationPosition="1" annotationPrecision="3" gridFrameSideFlags="15" offsetY="0" annotationExpression="" gridStyle="0" gridFrameWidth="2" topFrameDivisions="0" name="Grid 1" gridFrameStyle="0" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" maximumIntervalWidth="100" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationDisplay="3" frameFillColor2="0,0,0,255" leftAnnotationDirection="0" blendMode="0" rotatedTicksEnabled="0" show="0" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" gridFrameMargin="0" crossLength="3" rightAnnotationDirection="0" gridFramePenColor="0,0,0,255" topAnnotationDirection="0" minimumIntervalWidth="50" position="3" rotatedAnnotationsMarginToCorner="0" rightFrameDivisions="0" intervalY="5" topAnnotationPosition="1" showAnnotation="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0" leftFrameDivisions="0" offsetX="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid blendMode="0" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" offsetY="0" leftAnnotationPosition="1" gridFrameMargin="0" showAnnotation="0" bottomAnnotationDisplay="3" intervalX="5" topAnnotationDirection="0" name="Grid 1" topAnnotationDisplay="3" leftAnnotationDisplay="3" leftFrameDivisions="0" bottomAnnotationDirection="0" annotationFormat="4" frameFillColor1="255,255,255,255" bottomFrameDivisions="0" rotatedTicksMinimumAngle="0" topAnnotationPosition="1" gridFrameSideFlags="15" rightFrameDivisions="0" gridFrameStyle="0" show="0" topFrameDivisions="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" rightAnnotationDirection="0" frameFillColor2="0,0,0,255" offsetX="0" rotatedAnnotationsMarginToCorner="0" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" annotationPrecision="3" intervalY="5" gridFramePenColor="0,0,0,255" rotatedAnnotationsEnabled="0" unit="1" crossLength="3" gridStyle="0" rotatedTicksLengthMode="0" frameAnnotationDistance="1" bottomAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" leftAnnotationDirection="0" rightAnnotationDisplay="3" annotationExpression="" minimumIntervalWidth="50" gridFrameWidth="2" gridFramePenThickness="0.5">
           <lineStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="line" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="line" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -37761,44 +37765,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="marker" force_rhr="0" name="">
+            <symbol frame_rate="10" is_animated="0" type="marker" clip_to_extent="1" alpha="1" force_rhr="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
+              <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -37821,9 +37825,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -37840,32 +37844,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontKerning="1" fontWeight="50" namedStyle="" fontStrikeout="0" allowHtml="0" fontUnderline="0" textOpacity="1" forcedBold="0" previewBkgrdColor="255,255,255,255" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontFamily="Myriad Pro" fontSize="10" multilineHeight="1" fontItalic="0" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0" textOrientation="horizontal" capitalization="0" fontWordSpacing="0" fontSizeUnit="Point">
+          <text-style forcedBold="0" fontStrikeout="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" fontSize="10" fontKerning="1" fontWeight="50" blendMode="0" capitalization="0" previewBkgrdColor="255,255,255,255" allowHtml="0" multilineHeight="1" textColor="0,0,0,255" fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" namedStyle="" fontLetterSpacing="0" fontSizeUnit="Point" textOpacity="1">
             <families/>
-            <text-buffer bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferSize="1" bufferDraw="0" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskedSymbolLayers="" maskSizeUnits="MM" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskEnabled="0"/>
-            <background shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeFillColor="255,255,255,255" shapeOffsetY="0" shapeBorderWidth="0" shapeOpacity="1" shapeBlendMode="0" shapeOffsetX="0" shapeRotationType="0" shapeRadiiY="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRadiiX="0" shapeSizeUnit="MM" shapeDraw="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSVGFile="">
-              <symbol alpha="1" clip_to_extent="1" is_animated="0" frame_rate="10" type="fill" force_rhr="0" name="fillSymbol">
+            <text-buffer bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferNoFill="1" bufferSize="1" bufferDraw="0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1"/>
+            <text-mask maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskType="0" maskJoinStyle="128" maskEnabled="0" maskedSymbolLayers="" maskOpacity="1"/>
+            <background shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeType="0" shapeSizeY="0" shapeSVGFile="" shapeDraw="0" shapeSizeUnit="MM" shapeRadiiX="0" shapeJoinStyle="64" shapeSizeType="0" shapeBlendMode="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeOffsetY="0" shapeRadiiY="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0">
+              <symbol frame_rate="10" is_animated="0" type="fill" clip_to_extent="1" alpha="1" force_rhr="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                <layer enabled="1" locked="0" pass="0" class="SimpleFill">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -37880,29 +37884,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetGlobal="1" shadowColor="0,0,0,255" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusUnit="MM"/>
+            <shadow shadowRadius="1.5" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37910,46 +37914,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
+        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" 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="rasterize"/>
-          <Option value="true" type="bool" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~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_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
+          <Option type="bool" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="cone_only_groups" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortAscending="1" enabled="1" filterFeatures="0" sortFeatures="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" coverageLayerProvider="virtual" hideCoverage="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+      <Atlas enabled="1" sortKey="&quot;group&quot;" filterFeatures="0" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerName="cone_only_groups" sortAscending="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90592672607977676" xmax="18.40637769723523931" xmin="18.40536111431805821" ymin="-33.90645936682980022">
+    <DefaultViewExtent ymin="-33.90554579787111322" ymax="-33.89679639014174484" xmax="18.41248800356770587" xmin="18.39622267689280832">
       <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>
@@ -37963,10 +37967,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStepUnit="h" timeStep="1" cumulativeTemporalRange="0" frameRate="1"/>
+  <ProjectTimeSettings frameRate="1" timeStep="1" timeStepUnit="h" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -37975,29 +37979,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="direction_format"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
+        <Option type="bool" value="false" name="show_leading_zeros"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="false" name="show_suffix"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index 9c54231..648ab5e 100644
Binary files a/GIS Base Map/marshal_positions.dbf and b/GIS Base Map/marshal_positions.dbf differ